Compare commits

...
Author SHA1 Message Date
Uriel dc21b3a02d Merge branch 'main' into update-eslint 2025-09-09 19:48:55 -03:00
Uriel 0f06ac0253 update linux metadata (#1524) 2025-09-04 13:44:17 -03:00
Butterscotch! 4568ebb41a Foot snapping fix (#1519) 2025-09-03 21:11:24 -03:00
Ilia Ki 2777d8af89 Fix endian docs for smol HID (#1520) 2025-09-03 20:03:39 -03:00
Uriel ac2472d62f format 2025-09-01 12:20:35 -04:00
Uriel 820d99d76d Merge branch 'main' into update-eslint 2025-09-01 12:17:17 -04:00
Eiren Rain 3f9b997ffa Bump awalsh128/cache-apt-pkgs-action from 1.5.1 to 1.5.3 (#1515) 2025-08-19 21:45:46 +02:00
dependabot[bot] df379ee234 Bump awalsh128/cache-apt-pkgs-action from 1.5.1 to 1.5.3
Bumps [awalsh128/cache-apt-pkgs-action](https://github.com/awalsh128/cache-apt-pkgs-action) from 1.5.1 to 1.5.3.
- [Release notes](https://github.com/awalsh128/cache-apt-pkgs-action/releases)
- [Commits](https://github.com/awalsh128/cache-apt-pkgs-action/compare/v1.5.1...v1.5.3)

---
updated-dependencies:
- dependency-name: awalsh128/cache-apt-pkgs-action
  dependency-version: 1.5.3
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>
2025-08-19 12:17:12 +00:00
Eiren Rain acd628637e Bump actions/download-artifact from 4 to 5 (#1516) 2025-08-19 14:14:48 +02:00
dependabot[bot] 155dbfbff1 Bump actions/download-artifact from 4 to 5
Bumps [actions/download-artifact](https://github.com/actions/download-artifact) from 4 to 5.
- [Release notes](https://github.com/actions/download-artifact/releases)
- [Commits](https://github.com/actions/download-artifact/compare/v4...v5)

---
updated-dependencies:
- dependency-name: actions/download-artifact
  dependency-version: '5'
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <[email protected]>
2025-08-19 12:13:29 +00:00
Eiren Rain eda3d74c54 Bump actions/checkout from 4 to 5 (#1517) 2025-08-19 14:12:25 +02:00
dependabot[bot] 4b9f393cee Bump actions/checkout from 4 to 5
Bumps [actions/checkout](https://github.com/actions/checkout) from 4 to 5.
- [Release notes](https://github.com/actions/checkout/releases)
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
- [Commits](https://github.com/actions/checkout/compare/v4...v5)

---
updated-dependencies:
- dependency-name: actions/checkout
  dependency-version: '5'
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <[email protected]>
2025-08-18 22:56:14 +00:00
Eiren Rain 069da63d1f fix(gui): export proportions button doesn't work (#1513) 2025-08-01 11:51:31 +03:00
DevMiner 3fbe58b027 fix(gui): export proportions button doesn't work 2025-08-01 02:21:26 +02:00
Eiren Rain aa6b5ab028 Bring back resetMountingFeet toggle for mounting resets (#1509) 2025-07-31 22:07:30 +03:00
Erimel b2ee4e0b5e Change icons for new mounting reset buttons 2025-07-29 17:29:25 -04:00
Erimel 34ab0c6252 Bring back resetMountingFeet toggle for mounting resets 2025-07-29 17:14:05 -04:00
Butterscotch! a8116a7f35 Fix mounting reset not working for feet (#1508) 2025-07-29 16:33:27 -04:00
Eiren Rain 8c65129bb4 New Pontoon translations (#1502) 2025-07-26 06:02:35 +03:00
NolaandVyolex acaf6a7679 Pontoon: Update Dutch (nl) localization of GUI
Co-authored-by: Nola <[email protected]>
Co-authored-by: Vyolex <[email protected]>
2025-07-26 05:01:55 +02:00
nekomona 8044a8a824 Pontoon: Update Simplified Chinese (zh-Hans) localization of GUI
Co-authored-by: nekomona <[email protected]>
2025-07-26 05:01:55 +02:00
Yexo 1ec03b83b6 Pontoon: Update Polish (pl) localization of GUI
Co-Authored-By: Yexo <[email protected]>
2025-07-26 05:01:55 +02:00
lucas lelievre 44caf24126 FW update + Fix download url 2025-07-26 05:00:37 +02:00
Erimel a125195695 Pontoon: Update French (fr) localization of GUI
Co-authored-by: Erimel <[email protected]>
2025-07-22 23:08:56 +00:00
ErimelandUriel d27385dfa4 Allow partial/separate resets for feet and fingers (#1441)
Co-authored-by: Uriel <[email protected]>
2025-07-22 19:08:34 -04:00
DevMiner 68bd670d7c fix(gui/wizard): manual calibration reset body proportions's reset button isn't primary (#1503) 2025-07-20 22:26:46 +02:00
Eiren Rain 42eda428ae New Pontoon translations (#1499) 2025-07-18 02:11:40 +03:00
YumeTomo 6504ebb9fb Pontoon: Update Thai (th) localization of GUI
Co-authored-by: YumeTomo <[email protected]>
2025-07-17 21:50:41 +00:00
MenacingExiler 6332615b08 Pontoon: Update Vietnamese (vi) localization of GUI
Co-authored-by: MenacingExiler <[email protected]>
2025-07-17 21:50:41 +00:00
Uriel e054c393ea Add loucas003 for GUI settings codeowner 2025-07-17 18:50:23 -03:00
dependabot[bot] 85c30b9425 Bump awalsh128/cache-apt-pkgs-action from 1.5.0 to 1.5.1 (#1495)
Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2025-07-17 18:10:00 -03:00
Uriel 68e3100a04 add a fixme 2025-07-09 18:09:47 -04:00
Uriel 59e13eba43 fix after merge 2025-07-09 18:09:20 -04:00
Uriel 858191729c Merge branch 'main' into update-eslint 2025-07-09 18:02:30 -04:00
Uriel 36a3303b2b eslint fix latest 2025-06-20 18:07:43 -04:00
Uriel 0792c06136 Merge branch 'main' into update-eslint 2025-06-20 18:05:33 -04:00
Uriel 657ee489a1 update eslint again 2025-06-20 17:56:33 -04:00
Uriel c115d4a8fb dont show prettier errors 2025-06-15 19:08:58 -04:00
Uriel 7df4d5643b Merge branch 'main' into update-eslint 2025-06-15 18:38:10 -04:00
Uriel 83583d42ad remove unused imports 2025-06-15 18:36:47 -04:00
Uriel 62c8567052 eslint fix everything 2025-06-15 04:12:04 -04:00
Uriel 290b9869b8 Update eslint packages 2025-06-15 04:11:38 -04:00
214 changed files with 5714 additions and 4489 deletions

No files matched your search

+1 -1
View File
@@ -14,7 +14,7 @@
/gui/src/i18n/ @ImUrX @Erimelowo
/l10n.toml @ImUrX @Erimelowo
/gui/src/components/settings/ @Erimelowo @ImUrX
/gui/src/components/settings/ @Erimelowo @ImUrX @loucass003
# Rust part of the GUI
/gui/src-tauri/ @ImUrX
+3 -3
View File
@@ -21,7 +21,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v5
with:
submodules: recursive
@@ -59,13 +59,13 @@ jobs:
BUILD_ARCH: ${{ endsWith(matrix.os, 'arm') && 'aarch64' || 'amd64' }}
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v5
with:
submodules: recursive
- if: startsWith(matrix.os, 'ubuntu')
name: Set up Linux dependencies
uses: awalsh128/[email protected].0
uses: awalsh128/[email protected].3
with:
packages: libgtk-3-dev webkit2gtk-4.1 libappindicator3-dev librsvg2-dev patchelf
# Increment to invalidate the cache
+10 -10
View File
@@ -19,7 +19,7 @@ jobs:
runs-on: ${{ matrix.os }}
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v5
with:
submodules: recursive
@@ -48,7 +48,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v5
with:
submodules: recursive
@@ -87,7 +87,7 @@ jobs:
bundle-android:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v5
with:
submodules: recursive
@@ -154,17 +154,17 @@ jobs:
env:
BUILD_ARCH: ${{ endsWith(matrix.os, 'arm') && 'aarch64' || 'amd64' }}
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v5
with:
submodules: recursive
- uses: actions/download-artifact@v4
- uses: actions/download-artifact@v5
with:
name: 'SlimeVR-Server'
path: server/desktop/build/libs/
- name: Set up Linux dependencies
uses: awalsh128/[email protected].0
uses: awalsh128/[email protected].3
with:
packages: |
build-essential curl wget file libssl-dev libgtk-3-dev libappindicator3-dev librsvg2-dev
@@ -252,11 +252,11 @@ jobs:
needs: [build, test]
if: contains(fromJSON('["workflow_dispatch", "create"]'), github.event_name)
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v5
with:
submodules: recursive
- uses: actions/download-artifact@v4
- uses: actions/download-artifact@v5
with:
name: 'SlimeVR-Server'
path: server/desktop/build/libs/
@@ -332,11 +332,11 @@ jobs:
env:
BUILD_ARCH: ${{ endsWith(matrix.os, 'arm') && 'win-aarch64' || 'win64' }}
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v5
with:
submodules: recursive
- uses: actions/download-artifact@v4
- uses: actions/download-artifact@v5
with:
name: 'SlimeVR-Server'
path: server/desktop/build/libs/
+1 -1
View File
@@ -12,7 +12,7 @@ jobs:
pull-requests: write
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v5
with:
submodules: recursive
- uses: repo-sync/pull-request@v2
+1 -1
View File
@@ -15,7 +15,7 @@ jobs:
contents: write
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v5
with:
ref: pontoon
submodules: recursive
Generated
+3 -3
View File
@@ -2645,7 +2645,7 @@ version = "0.7.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "af1844ef2428cc3e1cb900be36181049ef3d3193c63e43026cfe202983b27a56"
dependencies = [
"proc-macro-crate 1.3.1",
"proc-macro-crate 2.0.0",
"proc-macro2",
"quote",
"syn 2.0.87",
@@ -4539,9 +4539,9 @@ dependencies = [
[[package]]
name = "tauri-plugin-fs"
version = "2.4.0"
version = "2.4.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c341290d31991dbca38b31d412c73dfbdb070bb11536784f19dd2211d13b778f"
checksum = "8c6ef84ee2f2094ce093e55106d90d763ba343fad57566992962e8f76d113f99"
dependencies = [
"anyhow",
"dunce",
+119 -31
View File
@@ -1,28 +1,74 @@
import { FlatCompat } from '@eslint/eslintrc';
import eslint from '@eslint/js';
import globals from 'globals';
import tseslint from 'typescript-eslint';
import js from '@eslint/js';
import importAlias from '@dword-design/eslint-plugin-import-alias';
import { configs, plugins } from 'eslint-config-airbnb-extended';
import { rules as prettierConfigRules } from 'eslint-config-prettier';
import prettierPlugin from 'eslint-plugin-prettier';
const compat = new FlatCompat();
const jsConfig = [
// ESLint Recommended Rules
{
name: 'js/config',
...js.configs.recommended,
},
// Stylistic Plugin
plugins.stylistic,
// Import X Plugin
plugins.importX,
// Airbnb Base Recommended Config
...configs.base.recommended,
];
const reactConfig = [
// React Plugin
plugins.react,
// React Hooks Plugin
plugins.reactHooks,
// React JSX A11y Plugin
plugins.reactA11y,
// Airbnb React Recommended Config
...configs.react.recommended,
];
const typescriptConfig = [
// TypeScript ESLint Plugin
plugins.typescriptEslint,
// Airbnb Base TypeScript Config
...configs.base.typescript,
// Airbnb React TypeScript Config
...configs.react.typescript,
];
const prettierConfig = [
// Prettier Plugin
{
name: 'prettier/plugin/config',
plugins: {
prettier: prettierPlugin,
},
},
// Prettier Config
{
name: 'prettier/config',
rules: {
...prettierConfigRules,
// remove errors with prettier, use prettier for that pls
// 'prettier/prettier': 'error',
},
},
];
export const gui = [
eslint.configs.recommended,
...tseslint.configs.recommended,
...compat.extends('plugin:@dword-design/import-alias/recommended'),
...compat.plugins('eslint-plugin-react-hooks'),
// Add import-alias rule inside compat because plugin doesn't like flat configs
...compat.config({
rules: {
'@dword-design/import-alias/prefer-alias': [
'error',
{
alias: {
'@': './src/',
},
},
],
},
}),
// Javascript Config
...jsConfig,
// React Config
...reactConfig,
// TypeScript Config
...typescriptConfig,
// Prettier Config
...prettierConfig,
importAlias.configs.recommended,
{
languageOptions: {
ecmaVersion: 'latest',
@@ -39,10 +85,52 @@ export const gui = [
},
},
files: ['src/**/*.{js,jsx,ts,tsx,json}'],
plugins: {
'@typescript-eslint': tseslint.plugin,
},
rules: {
// fixes for airbnb
'max-classes-per-file': 'off',
'no-underscore-dangle': 'off',
'no-plusplus': 'off',
'consistent-return': 'off',
'no-bitwise': 'off',
eqeqeq: ['error', 'smart'],
'no-restricted-syntax': 'off',
'no-param-reassign': 'off',
'no-return-assign': ['error', 'except-parens'],
'default-case': 'off',
'no-continue': 'off',
'react/forbid-prop-types': 'off',
'no-script-url': 'off',
// stuff that should be enabled again later
eqeqeq: 'off',
'no-nested-ternary': 'off',
// FIXME: Remove after merge of https://github.com/SlimeVR/SlimeVR-Server/pull/1494
'no-await-in-loop': 'off',
'@typescript-eslint/no-use-before-define': 'off',
'@typescript-eslint/no-shadow': 'off',
'import-x/prefer-default-export': 'off',
'import-x/no-cycle': 'off',
'import-x/no-rename-default': 'off',
'jsx-a11y/heading-has-content': 'off',
'jsx-a11y/alt-text': 'off',
'jsx-a11y/media-has-caption': 'off',
'jsx-a11y/no-static-element-interactions': 'off',
'jsx-a11y/click-events-have-key-events': 'off',
'jsx-a11y/label-has-associated-control': 'off',
'jsx-a11y/no-noninteractive-element-interactions': 'off',
'jsx-a11y/no-noninteractive-element-to-interactive-role': 'off',
'jsx-a11y/anchor-is-valid': 'off',
'react/require-default-props': 'off',
'react/no-unstable-nested-components': 'off',
'react/no-unused-prop-types': 'off',
'react-hooks/rules-of-hooks': 'off',
'react-hooks/exhaustive-deps': 'off',
// end
'@typescript-eslint/switch-exhaustiveness-check': [
'error',
{
considerDefaultExhaustiveForUnions: true,
},
],
'react/react-in-jsx-scope': 'off',
'react/prop-types': 'off',
'spaced-comment': 'error',
@@ -60,14 +148,14 @@ export const gui = [
ignoreRestSiblings: true,
},
],
},
settings: {
'import/resolver': {
typescript: {},
},
react: {
version: 'detect',
},
'@dword-design/import-alias/prefer-alias': [
'error',
{
alias: {
'@': './src/',
},
},
],
},
},
// Global ignore
+18 -13
View File
@@ -18,7 +18,7 @@
"@tanstack/react-query": "^5.48.0",
"@tauri-apps/api": "^2.0.2",
"@tauri-apps/plugin-dialog": "^2.0.0",
"@tauri-apps/plugin-fs": "^2.0.0",
"@tauri-apps/plugin-fs": "2.4.1",
"@tauri-apps/plugin-http": "^2.5.0",
"@tauri-apps/plugin-os": "^2.0.0",
"@tauri-apps/plugin-shell": "^2.0.0",
@@ -66,9 +66,12 @@
"gen:icons": "tauri icon --ios-color '#663499' src-tauri/icons/icon.svg"
},
"devDependencies": {
"@dword-design/eslint-plugin-import-alias": "^4.0.9",
"@dword-design/eslint-plugin-import-alias": "^6.0.3",
"@eslint/compat": "^1.3.0",
"@eslint/js": "^9.29.0",
"@openapi-codegen/cli": "^2.0.2",
"@openapi-codegen/typescript": "^8.0.2",
"@stylistic/eslint-plugin": "^3.1.0",
"@tailwindcss/forms": "^0.5.9",
"@tauri-apps/cli": "^2.0.2",
"@types/file-saver": "^2.0.7",
@@ -78,27 +81,29 @@
"@types/react-modal": "3.16.3",
"@types/semver": "^7.5.8",
"@types/three": "^0.163.0",
"@typescript-eslint/eslint-plugin": "^7.18.0",
"@typescript-eslint/parser": "^7.18.0",
"@typescript-eslint/eslint-plugin": "^8.34.0",
"@typescript-eslint/parser": "^8.34.0",
"@vitejs/plugin-react": "^4.3.2",
"autoprefixer": "^10.4.20",
"cross-env": "^7.0.3",
"dotenv": "^16.4.5",
"eslint": "^8.57.1",
"eslint-config-airbnb": "^19.0.4",
"eslint-import-resolver-typescript": "^3.6.3",
"eslint-plugin-import": "^2.31.0",
"eslint-plugin-jsx-a11y": "^6.10.0",
"eslint-plugin-react": "^7.37.1",
"eslint-plugin-react-hooks": "^4.6.2",
"eslint": "^9.29.0",
"eslint-config-airbnb-extended": "^2.1.0",
"eslint-config-prettier": "^10.1.5",
"eslint-import-resolver-typescript": "^4.4.3",
"eslint-plugin-import-x": "^4.15.2",
"eslint-plugin-jsx-a11y": "^6.10.2",
"eslint-plugin-prettier": "^5.4.1",
"eslint-plugin-react": "^7.37.5",
"eslint-plugin-react-hooks": "^5.2.0",
"globals": "^15.10.0",
"prettier": "^3.3.3",
"prettier": "^3.5.3",
"rollup-plugin-visualizer": "^5.12.0",
"sass": "^1.79.4",
"spdx-satisfies": "^5.0.1",
"tailwind-gradient-mask-image": "^1.2.0",
"tailwindcss": "^3.4.13",
"typescript-eslint": "^8.8.0",
"typescript-eslint": "^8.34.0",
"vite": "^5.4.8"
}
}
+5 -3
View File
@@ -237,6 +237,8 @@ reset-reset_all_warning_default-v2 =
reset-full = Full Reset
reset-mounting = Reset Mounting
reset-mounting-feet = Reset Feet Mounting
reset-mounting-fingers = Reset Fingers Mounting
reset-yaw = Yaw Reset
## Serial detection stuff
@@ -274,7 +276,7 @@ widget-overlay-is_mirrored_label = Display Overlay as Mirror
widget-drift_compensation-clear = Clear drift compensation
## Widget: Clear Reset Mounting
widget-clear_mounting = Clear reset mounting
widget-clear_mounting = Clear Reset Mounting
## Widget: Developer settings
widget-developer_mode = Developer Mode
@@ -584,8 +586,8 @@ settings-general-fk_settings-leg_tweak-floor_clip-description = Floor-clip can r
settings-general-fk_settings-leg_tweak-toe_snap-description = Toe-snap attempts to guess the rotation of your feet if foot trackers are not in use.
settings-general-fk_settings-leg_tweak-foot_plant-description = Foot-plant rotates your feet to be parallel to the ground when in contact.
settings-general-fk_settings-leg_fk = Leg tracking
settings-general-fk_settings-leg_fk-reset_mounting_feet-description = Enable feet Mounting Reset by tiptoeing.
settings-general-fk_settings-leg_fk-reset_mounting_feet = Feet Mounting Reset
settings-general-fk_settings-leg_fk-reset_mounting_feet-description-v1 = Force feet mounting reset during general mounting resets.
settings-general-fk_settings-leg_fk-reset_mounting_feet-v1 = Force feet mounting reset
settings-general-fk_settings-enforce_joint_constraints = Skeletal Limits
settings-general-fk_settings-enforce_joint_constraints-enforce_constraints = Enforce constraints
settings-general-fk_settings-enforce_joint_constraints-enforce_constraints-description = Prevents joints from rotating past their limit
+10 -4
View File
@@ -269,6 +269,7 @@ navbar-settings = Réglages
bvh-start_recording = Enregistrer BVH
bvh-recording = Enregistrement...
bvh-save_title = Sauvegarder l’enregistrement BVH
## Tracking pause
@@ -406,6 +407,7 @@ tracker-settings-forget-label = Oublier capteur
tracker-settings-update-unavailable = Ne peut pas être mis à jour (DIY)
tracker-settings-update-low-battery = Mise à jour impossible. Batterie inférieure à 50 %
tracker-settings-update-up_to_date = À jour
tracker-settings-update-blocked = Mise à jour non disponible. Aucune autre version disponible
tracker-settings-update-available = { $versionName } est maintenant disponible
tracker-settings-update = Mettre à jour maintenant
tracker-settings-update-title = Version du micrologiciel
@@ -584,6 +586,7 @@ settings-stay_aligned-relaxed_poses-sitting = Ajuster les capteurs en position a
settings-stay_aligned-relaxed_poses-flat = Ajuster les capteurs en position assise sur le sol ou allongée sur le dos
settings-stay_aligned-relaxed_poses-save_pose = Enregistrer la posture
settings-stay_aligned-relaxed_poses-reset_pose = Réinitialiser la posture
settings-stay_aligned-relaxed_poses-close = Fermer
settings-stay_aligned-debug-label = Débogage
settings-stay_aligned-debug-description = Veuillez inclure vos paramètres lorsque vous signalez des problèmes concernant Garder Aligné.
settings-stay_aligned-debug-copy-label = Copier les paramètres dans le presse-papiers
@@ -744,6 +747,9 @@ settings-interface-behavior-error_tracking-description_v2 =
Pour offrir la meilleure expérience utilisateur possible, nous collectons des rapports d'erreurs anonymisés, des mesures de performance et des informations sur le système d'exploitation. Cela nous aide à détecter les bugs et les problèmes liés à SlimeVR. Ces données sont collectées via Sentry.io.
settings-interface-behavior-error_tracking-label = Envoyer les erreurs aux développeurs
settings-interface-behavior-bvh_directory = Répertoire pour sauvegarder les enregistrements BVH
settings-interface-behavior-bvh_directory-description = Choisissez un répertoire où sauvegarder vos enregistrements BVH au lieu d’avoir à choisir où les sauvegarder à chaque fois.
settings-interface-behavior-bvh_directory-label = Répertoire où sauvegarder les enregistrements BVH
## Serial settings
@@ -1014,7 +1020,7 @@ onboarding-connect_tracker-next = J'ai connecté tous mes capteurs
onboarding-calibration_tutorial = Tutoriel de calibration IMU
onboarding-calibration_tutorial-subtitle = Ceci vous aidera à réduire la dérive du capteur !
onboarding-calibration_tutorial-description = Chaque fois que vous allumez vos capteurs, ils doivent rester sur une surface plane pour se calibrer. Faisons de même en cliquant sur le bouton « { onboarding-calibration_tutorial-calibrate } ». <b>Ne les déplacez pas !</b>
onboarding-calibration_tutorial-description-v1 = Après avoir allumé vos capteurs, placez-les sur une surface stable pendant un moment pour leur permettre de se calibrer. La calibration peut être effectué n'importe quand lors que les capteurs sont allumés - cette page sert simplement de tutoriel. Pour commencer, cliquez sur le bouton « { onboarding-calibration_tutorial-calibrate } », puis <b>ne déplacez pas vos capteurs !</b>
onboarding-calibration_tutorial-calibrate = J'ai posé mes capteurs sur la table
onboarding-calibration_tutorial-status-waiting = En attente de vous
onboarding-calibration_tutorial-status-calibrating = Calibration...
@@ -1332,13 +1338,13 @@ onboarding-stay_aligned-preparation-title = Préparation
onboarding-stay_aligned-preparation-tip = Assurez-vous de vous tenir droit. Vous devez regarder vers l'avant et vos bras doivent être le long de votre corps.
onboarding-stay_aligned-relaxed_poses-standing-title = Posture debout détendu
onboarding-stay_aligned-relaxed_poses-standing-step-0 = 1. Tenez-vous dans une position confortable. Détendez-vous !
onboarding-stay_aligned-relaxed_poses-standing-step-2 = 3. Appuyez sur le bouton « Enregistrer la posture ».
onboarding-stay_aligned-relaxed_poses-standing-step-1-v2 = 2. Appuyez sur le bouton « Enregistrer la posture ».
onboarding-stay_aligned-relaxed_poses-sitting-title = Posture assis détendu dans une chaise
onboarding-stay_aligned-relaxed_poses-sitting-step-0 = 1. Asseyez-vous dans une position confortable. Détendez-vous !
onboarding-stay_aligned-relaxed_poses-sitting-step-2 = 3. Appuyez sur le bouton « Enregistrer la posture ».
onboarding-stay_aligned-relaxed_poses-sitting-step-1-v2 = 2. Appuyez sur le bouton « Enregistrer la posture ».
onboarding-stay_aligned-relaxed_poses-flat-title = Posture assis détendu sur le sol
onboarding-stay_aligned-relaxed_poses-flat-step-0 = 1. Asseyez-vous sur le sol, les jambes devant. Détendez-vous !
onboarding-stay_aligned-relaxed_poses-flat-step-2 = 3. Appuyez sur le bouton « Enregistrer la posture ».
onboarding-stay_aligned-relaxed_poses-flat-step-1-v2 = 2. Appuyez sur le bouton « Enregistrer la posture ».
onboarding-stay_aligned-relaxed_poses-skip_step = Sauter
onboarding-stay_aligned-done-title = Garder Aligné activé !
onboarding-stay_aligned-done-description = La configuration de Garder Aligné est terminée !
+227 -4
View File
@@ -111,29 +111,122 @@ board_type-GLOVE_IMU_SLIMEVR_DEV = SlimeVR Dev IMU Handschoen
skeleton_bone-NONE = Geen
skeleton_bone-HEAD = Hoofdverschuiving
skeleton_bone-HEAD-desc =
Dit is de afstand tussen je headset en het midden van je hoofd.
Om dit aan te passen, schud je je hoofd naar links en rechts alsof je 'nee' zegt,
pas het aan totdat beweging van de andere trackers te verwaarlozen is.
skeleton_bone-NECK = Neklengte
skeleton_bone-NECK-desc =
Dit is de afstand tussen het midden van je hoofd en de basis van je nek.
Om dit aan te passen, beweeg je je hoofd op en neer alsof je knikt, of kantel je je hoofd
naar links en rechts. Wijzig de positie totdat beweging in andere trackers verwaarloosbaar is.
skeleton_bone-torso_group = Romp lengte
skeleton_bone-torso_group-desc =
Dit is de afstand van je nek tot je heupen.
Om dit aan te passen, ga rechtop staan en pas het aan totdat je virtuele heupen
in lijn zijn met je echte heupen.
skeleton_bone-UPPER_CHEST = Bovenborst Lengte
skeleton_bone-UPPER_CHEST-desc =
Dit is de afstand tussen de basis van je nek en het midden van je borst.
Om dit aan te passen, stel je de torso-lengte correct af en pas je deze aan in verschillende houdingen
(zitten, bukken, liggen, enz.) totdat je virtuele ruggengraat overeenkomt met je echte.
skeleton_bone-CHEST_OFFSET = Borstoffset
skeleton_bone-CHEST_OFFSET-desc =
Dit kan worden aangepast om je virtuele borsttracker omhoog of omlaag te verplaatsen,
om te helpen bij de kalibratie in bepaalde spellen of applicaties die verwachten dat deze hoger of lager staat.
skeleton_bone-CHEST = Borstafstand
skeleton_bone-CHEST-desc =
Dit is de afstand van het midden van je borst tot het midden van je ruggengraat.
Om dit aan te passen, stel je de torso-lengte correct af en pas je deze aan in verschillende houdingen
(zitten, bukken, liggen, enz.) totdat je virtuele ruggengraat overeenkomt met je echte.
skeleton_bone-WAIST = Taille lengte
skeleton_bone-WAIST-desc =
Dit is de afstand van het midden van je ruggengraat tot je navel.
Om dit aan te passen, stel je de torso-lengte correct af en pas je deze aan in verschillende houdingen
(zitten, bukken, liggen, enz.) totdat je virtuele ruggengraat overeenkomt met je echte.
skeleton_bone-HIP = Heuplengte
skeleton_bone-HIP-desc =
Dit is de afstand van je navel tot je heupen.
Om dit aan te passen, stel je de torso-lengte correct in en pas je deze aan in verschillende houdingen
(zitten, bukken, liggen, enz.) totdat je virtuele ruggengraat overeenkomt met je echte.
skeleton_bone-HIP_OFFSET = Heupoffset
skeleton_bone-HIP_OFFSET-desc =
Dit kan worden aangepast om je virtuele heuptracker omhoog of omlaag te verplaatsen,
om te helpen bij de kalibratie in bepaalde spellen of applicaties die mogelijk verwachten dat deze zich rond je middel bevindt.
skeleton_bone-HIPS_WIDTH = Heupbreedte
skeleton_bone-HIPS_WIDTH-desc =
Dit is de afstand tussen het begin van je benen.
Om dit aan te passen, voer je een volledige reset uit met je benen gestrekt en pas je het aan totdat je virtuele benen horizontaal overeenkomen met je echte.
skeleton_bone-leg_group = Beenlengte
skeleton_bone-leg_group-desc =
Dit is de afstand van je heupen tot je voeten.
Om dit aan te passen, pas je je torso-lengte op de juiste manier aan
totdat je virtuele voeten op hetzelfde niveau staan als je echte.
skeleton_bone-UPPER_LEG = Bovenbeenlengte
skeleton_bone-UPPER_LEG-desc =
Dit is de afstand van je heupen tot je knieën.
Om dit aan te passen, pas je je beenlengte op de juiste manier aan
totdat je virtuele knieën op dezelfde hoogte zijn als je echte.
skeleton_bone-LOWER_LEG = Onderbeenlengte
skeleton_bone-LOWER_LEG-desc =
Dit is de afstand van je knieën tot je enkels.
Om dit aan te passen, pas je je beenlengte op de juiste manier aan
totdat je virtuele knieën op dezelfde hoogte zijn als je echte knieën.
skeleton_bone-FOOT_LENGTH = Voetlengte
skeleton_bone-FOOT_LENGTH-desc =
Dit is de afstand van je enkels tot je tenen.
Om dit aan te passen, ga op je tenen staan en pas het aan totdat je virtuele voeten op hun plaats blijven.
skeleton_bone-FOOT_SHIFT = Voetverschuiving
skeleton_bone-FOOT_SHIFT-desc =
Deze waarde is de horizontale afstand van je knie tot je enkel.
Dit houdt rekening met het feit dat je onderbenen naar achteren staan wanneer je rechtop staat.
Om dit aan te passen, stel je de voetlengte in op 0, voer je een volledige reset uit,
en pas je het aan totdat je virtuele voeten op één lijn liggen met het midden van je enkels.
skeleton_bone-SKELETON_OFFSET = Skelet offset
skeleton_bone-SKELETON_OFFSET-desc =
Dit kan worden aangepast om al je trackers naar voren of naar achteren te verschuiven.
Het kan worden gebruikt om te helpen bij de kalibratie in bepaalde spellen of toepassingen
die mogelijk verwachten dat je trackers verder naar voren staan.
skeleton_bone-SHOULDERS_DISTANCE = Schoudersafstand
skeleton_bone-SHOULDERS_DISTANCE-desc =
Dit is de verticale afstand van de basis van je nek tot je schouders.
Om dit aan te passen, stel je de lengte van je bovenarm in op 0 en
pas je deze aan totdat je virtuele elleboogtrackers verticaal uitlijnen met je echte schouders.
skeleton_bone-SHOULDERS_WIDTH = Schouderbreedte
skeleton_bone-SHOULDERS_WIDTH-desc =
Dit is de horizontale afstand van de basis van je nek tot je schouders.
Om dit aan te passen, stel je de lengte van je bovenarm in op 0 en pas je deze aan
totdat je virtuele elleboogtrackers horizontaal uitlijnen met je echte schouders.
skeleton_bone-arm_group = Armlengte
skeleton_bone-arm_group-desc =
Dit is de afstand van je schouders tot je polsen.
Om dit aan te passen, pas je de schouderafstand correct aan, stel je Handafstand Y in op 0,
en pas je deze aan totdat je handtrackers op één lijn liggen met je polsen.
skeleton_bone-UPPER_ARM = Bovenarmlengte
skeleton_bone-UPPER_ARM-desc =
Dit is de afstand van je schouders tot je ellebogen.
Om dit aan te passen, pas je de armlengte correct aan en pas je deze aan
totdat je elleboogtrackers overeenkomen met je echte ellebogen.
skeleton_bone-LOWER_ARM = Onderarmlengte
skeleton_bone-LOWER_ARM-desc =
Dit is de afstand van je ellebogen tot je polsen.
Om dit aan te passen, pas je de armlengte correct aan en pas je deze aan
totdat je elleboogtrackers overeenkomen met je echte ellebogen.
skeleton_bone-HAND_Y = Afstand hand Y
skeleton_bone-HAND_Y-desc =
Dit is de verticale afstand van je polsen tot het midden van je hand.
Om dit aan te passen voor motion capture, pas je de armlengte correct aan
en pas je deze aan totdat je handtrackers verticaal uitgelijnd zijn met het midden van je handen.
Wil je het aanpassen voor elleboogtracking vanaf je controllers,
stel dan de armlengte in op 0 en pas je deze aan totdat je elleboogtrackers verticaal op één lijn liggen met je polsen.
skeleton_bone-HAND_Z = Afstand hand Z
skeleton_bone-HAND_Z-desc =
Dit is de horizontale afstand van je polsen tot het midden van je hand.
Als je dit wilt aanpassen voor motion capture, stel je deze in op 0.
Wil je het aanpassen voor elleboogtracking vanaf je controllers, stel dan de armlengte in op 0
en pas je deze aan totdat je elleboogtrackers horizontaal op één lijn liggen met je polsen.
skeleton_bone-ELBOW_OFFSET = Elleboogoffset
skeleton_bone-ELBOW_OFFSET-desc = Dit kan worden aangepast om je virtuele elleboogtrackers omhoog of omlaag te verplaatsen, zodat wordt voorkomen dat VRChat per ongeluk een elleboogtracker aan de borst koppelt.
## Tracker reset buttons
@@ -148,6 +241,8 @@ reset-reset_all_warning_default-v2 =
Weet je zeker dat je dit wilt doen?
reset-full = Volledige reset
reset-mounting = Reset montage
reset-mounting-feet = Reset voetmontage
reset-mounting-fingers = Reset vingermontage
reset-yaw = Yaw Reset
## Serial detection stuff
@@ -173,6 +268,7 @@ navbar-settings = Instellingen
bvh-start_recording = BVH opnemen
bvh-recording = Opname bezig...
bvh-save_title = Sla BVH-opname op
## Tracking pause
@@ -213,6 +309,7 @@ widget-imu_visualizer-rotation_raw = Rauw
widget-imu_visualizer-rotation_preview = Preview
widget-imu_visualizer-acceleration = Versnelling
widget-imu_visualizer-position = Positie
widget-imu_visualizer-stay_aligned = Blijf in lijn
## Widget: Skeleton Visualizer
@@ -240,6 +337,7 @@ tracker-table-column-temperature = Temp. °C
tracker-table-column-linear-acceleration = Accel. X/Y/Z
tracker-table-column-rotation = Rotatie X/Y/Z
tracker-table-column-position = Positie X/Y/Z
tracker-table-column-stay_aligned = Blijf in lijn
tracker-table-column-url = URL
## Tracker rotation
@@ -305,7 +403,9 @@ tracker-settings-forget = Vergeet tracker
tracker-settings-forget-description = Verwijdert de tracker van de SlimeVR Server en voorkomt dat deze verbinding kan maken totdat de server opnieuw wordt opgestart. De configuratie van de tracker blijft behouden.
tracker-settings-forget-label = Vergeet tracker
tracker-settings-update-unavailable = Kan niet worden bijgewerkt (DIY)
tracker-settings-update-low-battery = Kan niet worden bijgewerkt. Batterij lager dan 50%
tracker-settings-update-up_to_date = Up to date.
tracker-settings-update-blocked = Update is niet beschikbaar. Er zijn geen andere versies beschikbaar.
tracker-settings-update-available = { $versionName } is nu beschikbaar
tracker-settings-update = Werk nu bij.
tracker-settings-update-title = Firmware versie
@@ -375,6 +475,7 @@ mounting_selection_menu-close = Sluiten
settings-sidebar-title = Instellingen
settings-sidebar-general = Algemeen
settings-sidebar-tracker_mechanics = Trackersinstellingen
settings-sidebar-stay_aligned = Blijf in lijn
settings-sidebar-fk_settings = FK-instellingen
settings-sidebar-gesture_control = Tikbediening
settings-sidebar-interface = Interface
@@ -386,6 +487,7 @@ settings-sidebar-appearance = Uiterlijk
settings-sidebar-notifications = Notificaties
settings-sidebar-behavior = Gedrag
settings-sidebar-firmware-tool = DIY Firmware Tool
settings-sidebar-vrc_warnings = VRChat Configuratie-waarschuwingen
settings-sidebar-advanced = Geavanceerd
## SteamVR settings
@@ -443,7 +545,7 @@ settings-general-tracker_mechanics-drift_compensation-prediction = Voorspelling
# This cares about multilines
settings-general-tracker_mechanics-drift_compensation-prediction-description =
Voorspelt compensatie van gierdrift buiten het eerder gemeten bereik.
Schakel dit in als uw trackers continu om de gier-as draaien.
Schakel dit in als jouw trackers continu om de gier-as draaien.
settings-general-tracker_mechanics-drift_compensation-prediction-label = Voorspelling van driftcompensatie
settings-general-tracker_mechanics-drift_compensation_warning =
<b>Waarschuwing:</b> Gebruik alleen driftcompensatie als je heel vaak
@@ -463,6 +565,25 @@ settings-general-tracker_mechanics-use_mag_on_all_trackers-description =
Gebruikt magnetometer op alle trackers die er een compatibele firmware voor hebben, waardoor drift in stabiele magnetische omgevingen wordt verminderd.
Je kan dit per individuele tracker uit zetten in de instellingen van de tracker. <b>Sluit geen van de trackers af terwijl u dit in- en uitschakelt!</b>
settings-general-tracker_mechanics-use_mag_on_all_trackers-label = Gebruik magnetometer op de trackers
settings-stay_aligned = Blijf in lijn
settings-stay_aligned-description = ijf in lijn vermindert drift door je trackers geleidelijk aan te passen zodat ze overeenkomen met je ontspannen houdingen.
settings-stay_aligned-setup-label = Blijf in lijn instellen
settings-stay_aligned-setup-description = Je moet "Blijf in lijn instellen" voltooien om Blijf in lijn te activeren.
settings-stay_aligned-warnings-drift_compensation = ⚠ Schakel Drift Compensation uit! Drift Compensation conflicteert met Blijf in lijn.
settings-stay_aligned-enabled-label = Trackers aanpassen
settings-stay_aligned-hide_yaw_correction-label = Aanpassing verbergen (om te vergelijken zonder Blijf in lijn)
settings-stay_aligned-general-label = Algemeen
settings-stay_aligned-relaxed_poses-label = Ontspannen houdingen
settings-stay_aligned-relaxed_poses-description = Blijf in lijn gebruikt je ontspannen houdingen om je trackers in lijn te houden. Gebruik "Stel Blijf in lijn in" om deze houdingen bij te werken.
settings-stay_aligned-relaxed_poses-standing = Pas trackers aan terwijl je staat
settings-stay_aligned-relaxed_poses-sitting = Pas trackers aan terwijl je op een stoel zit
settings-stay_aligned-relaxed_poses-flat = Pas trackers aan terwijl je op de grond zit of op je rug ligt.
settings-stay_aligned-relaxed_poses-save_pose = Sla houding op
settings-stay_aligned-relaxed_poses-reset_pose = Reset houding
settings-stay_aligned-relaxed_poses-close = Sluiten
settings-stay_aligned-debug-label = Foutopsporing
settings-stay_aligned-debug-description = Voeg je instellingen toe wanneer je problemen met Blijf in lijn rapporteert.
settings-stay_aligned-debug-copy-label = Instellingen naar klembord kopiëren
## FK/Tracking settings
@@ -622,6 +743,9 @@ settings-interface-behavior-error_tracking-description_v2 =
Om de beste gebruikerservaring te bieden, verzamelen we geanonimiseerde foutrapporten, prestatiestatistieken en informatie over het besturingssysteem. Dit helpt ons bij het detecteren van fouten en problemen met SlimeVR. Deze statistieken worden verzameld via Sentry.io.
settings-interface-behavior-error_tracking-label = Stuur fouten naar de ontwikkelaars
settings-interface-behavior-bvh_directory = Map om BVH-opnames op te slaan
settings-interface-behavior-bvh_directory-description = Kies een map om je BVH-opnames op te slaan, zodat je niet elke keer hoeft te kiezen waar je ze opslaat.
settings-interface-behavior-bvh_directory-label = Map voor BVH-opnames
## Serial settings
@@ -861,6 +985,17 @@ onboarding-connect_tracker-connection_status-looking_for_server = Op zoek naar s
onboarding-connect_tracker-connection_status-connection_error = Kan geen verbinding maken met Wi-Fi
onboarding-connect_tracker-connection_status-could_not_find_server = Kan de server niet vinden
onboarding-connect_tracker-connection_status-done = Verbonden met de server
onboarding-connect_tracker-connection_status-no_serial_log = Kon geen logbestanden van de tracker ophalen.
onboarding-connect_tracker-connection_status-no_serial_device_found = Kon geen tracker via USB vinden.
onboarding-connect_serial-error-modal-no_serial_log = Staat de tracker aan?
onboarding-connect_serial-error-modal-no_serial_log-desc = Zorg dat de tracker aan staat en verbonden is met je computer.
onboarding-connect_serial-error-modal-no_serial_device_found = Geen trackers gedetecteerd
onboarding-connect_serial-error-modal-no_serial_device_found-desc =
Sluit een tracker met de meegeleverde USB-kabel aan op je computer en zet de tracker aan.
Als dit niet werkt:
-probeer een andere USB-kabel
-probeer een andere USB-poort
-probeer de SlimeVR-server opnieuw te installeren en selecteer "USB Drivers" in het onderdeelkeuze-menu
# $amount (Number) - Amount of trackers connected (this is a number, but you can use CLDR plural rules for your language)
# More info on https://www.unicode.org/cldr/cldr-aux/charts/22/supplemental/language_plural_rules.html
# English in this case only has 2 plural rules, which are "one" and "other",
@@ -878,7 +1013,7 @@ onboarding-connect_tracker-next = Ik heb al mijn trackers verbonden
onboarding-calibration_tutorial = Handleiding voor IMU-kalibratie
onboarding-calibration_tutorial-subtitle = Helpt met het verminderen van het driften van de trackers!
onboarding-calibration_tutorial-description = Elke keer dat je jouw trackers inschakelt, moeten ze even op een plat oppervlak rusten om te kalibreren. Leg al je trackers op een vlak oppervlak en <b>verplaats ze niet!</b>
onboarding-calibration_tutorial-description-v1 = Zet je trackers aan en leg ze even op een stabiele ondergrond om te kalibreren. Kalibratie kan op elk moment na het inschakelen van de trackers worden uitgevoerd — deze pagina biedt alleen een handleiding. Klik op de knop "{ onboarding-calibration_tutorial-calibrate }" om te beginnen en <b>beweeg je trackers daarna niet meer!</b>
onboarding-calibration_tutorial-calibrate = Al mijn trackers liggen neer
onboarding-calibration_tutorial-status-waiting = Ik wacht op jou
onboarding-calibration_tutorial-status-calibrating = Kalibreren
@@ -1006,7 +1141,7 @@ onboarding-assign_trackers-warning-WAIST =
onboarding-choose_mounting = Welke montagekalibratiemethode moet worden gebruikt?
# Multiline text
onboarding-choose_mounting-description = De oriëntatie van de montage corrigeert de plaatsing van trackers op uw lichaam.
onboarding-choose_mounting-description = De oriëntatie van de montage corrigeert de plaatsing van trackers op je lichaam.
onboarding-choose_mounting-auto_mounting = Automatische bevestiging
# Italicized text
onboarding-choose_mounting-auto_mounting-label-v2 = Aanbevolen
@@ -1044,6 +1179,9 @@ onboarding-automatic_mounting-mounting_reset-title = Montage-reset
onboarding-automatic_mounting-mounting_reset-step-0 = 1. Ga staan in een "skie"-houding met gebogen benen, je bovenlichaam naar voren gekanteld en armen gebogen.
onboarding-automatic_mounting-mounting_reset-step-1 = 2. Druk op de knop "Reset montage" en wacht 3 seconden voordat de montagerichtingen van de trackers opnieuw worden ingesteld.
onboarding-automatic_mounting-preparation-title = Voorbereiding
onboarding-automatic_mounting-preparation-v2-step-0 = 1. Druk op de knop "Volledige reset".
onboarding-automatic_mounting-preparation-v2-step-1 = 2. Ga rechtop staan met je armen langs je zij. Zorg dat je recht vooruit kijkt.
onboarding-automatic_mounting-preparation-v2-step-2 = 3. Houd deze houding aan totdat de timer van 3 seconden is afgelopen.
onboarding-automatic_mounting-put_trackers_on-title = Doe je trackers aan
onboarding-automatic_mounting-put_trackers_on-description = Om montagerichtingen te kalibreren gaan we gebruik maken van de trackers die je net hebt toegewezen. Doe al je trackers aan, je kunt zien welke trackers welke zijn in de figuur rechts.
onboarding-automatic_mounting-put_trackers_on-next = Ik heb al mijn trackers aan
@@ -1057,6 +1195,11 @@ onboarding-manual_proportions-fine_tuning_button-disabled-tooltip = Sluit een VR
onboarding-manual_proportions-export = Export proporties
onboarding-manual_proportions-import = Importeer proporties
onboarding-manual_proportions-file_type = Lichaamsproporties bestand
onboarding-manual_proportions-normal_increment = Normale verhoging
onboarding-manual_proportions-precise_increment = Nauwkeurige verhoging
onboarding-manual_proportions-grouped_proportions = Gegroepeerde verhoudingen
onboarding-manual_proportions-all_proportions = Alle verhoudingen
onboarding-manual_proportions-estimated_height = Geschatte gebruikerslengte
## Tracker automatic proportions setup
@@ -1074,6 +1217,8 @@ onboarding-automatic_proportions-requirements-descriptionv2 = Je hebt voldaan aa
onboarding-automatic_proportions-requirements-next = Ik heb de vereisten gelezen
onboarding-automatic_proportions-check_height-title-v3 = Meet de hoogte van uw headset
onboarding-automatic_proportions-check_height-description-v2 = De hoogte van uw headset (HMD) moet iets minder zijn dan uw volledige lengte, aangezien headsets uw ooghoogte meten. Deze meting wordt gebruikt als basis voor uw lichaamsverhoudingen.
# All the text is in bold!
onboarding-automatic_proportions-check_height-calculation_warning-v3 = Begin met meten terwijl je <u>rechtop</u> staat om je lengte te meten. Let erop dat je je handen niet hoger dan je headset tilt, want dat kan de meting beïnvloeden!
onboarding-automatic_proportions-check_height-guardian_tip = Als je een losse VR-bril gebruikt, zorg er dan voor dat je guardian/veilige zone is ingeschakeld zodat je lengte correct is gekalibreerd!
# Context is that the height is unknown
onboarding-automatic_proportions-check_height-unknown = Onbekend
@@ -1165,6 +1310,37 @@ onboarding-scaled_proportions-done-description = Je lichaamsverhoudingen zouden
## Stay Aligned setup
onboarding-stay_aligned-title = Blijf in lijn
onboarding-stay_aligned-description = Stel Blijf in lijn in om je trackers in lijn te houden.
onboarding-stay_aligned-put_trackers_on-title = Doe je trackers aan
onboarding-stay_aligned-put_trackers_on-description = Om je ontspannen houdingen op te slaan, gebruiken we de trackers die je zojuist hebt toegewezen. Doe al je trackers om; je kunt zien welke welke zijn op de afbeelding rechts.
onboarding-stay_aligned-put_trackers_on-trackers_warning = Je hebt momenteel minder dan 5 trackers aangesloten en toegewezen! Dit is het minimale aantal trackers dat nodig is om Blijf in lijn goed te laten werken.
onboarding-stay_aligned-put_trackers_on-next = Ik heb al mijn trackers aan
onboarding-stay_aligned-verify_mounting-title = Controleer je montage
onboarding-stay_aligned-verify_mounting-step-0 = Blijf in lijn vereist een goede montage. Anders krijg je geen goede ervaring met Blijf in lijn.
onboarding-stay_aligned-verify_mounting-step-1 = 1. Beweeg terwijl je staat.
onboarding-stay_aligned-verify_mounting-step-2 = 2. Ga zitten en beweeg je benen en voeten.
onboarding-stay_aligned-verify_mounting-step-3 = 3. Als je trackers niet op de juiste plek zitten, druk dan op "Montagekalibratie opnieuw uitvoeren".
onboarding-stay_aligned-verify_mounting-redo_mounting = Montagekalibratie opnieuw uitvoeren
onboarding-stay_aligned-preparation-title = Voorbereiding
onboarding-stay_aligned-preparation-tip = Zorg dat je rechtop staat. Blijf recht vooruit kijken en houd je armen langs je zij.
onboarding-stay_aligned-relaxed_poses-standing-title = Ontspannen Staande Houding
onboarding-stay_aligned-relaxed_poses-standing-step-0 = 1. Ga in een comfortabele houding staan. Ontspan!
onboarding-stay_aligned-relaxed_poses-standing-step-1-v2 = 2. Druk op de knop "Houding opslaan".
onboarding-stay_aligned-relaxed_poses-sitting-title = Ontspannen Zittende Houding op Stoel
onboarding-stay_aligned-relaxed_poses-sitting-step-0 = 1. Ga comfortabel zitten. Ontspan!
onboarding-stay_aligned-relaxed_poses-sitting-step-1-v2 = 2. Druk op de knop "Houding opslaan".
onboarding-stay_aligned-relaxed_poses-flat-title = Ontspannen Zittende Houding op de Vloer
onboarding-stay_aligned-relaxed_poses-flat-step-0 = 1. Ga op de vloer zitten met je benen voor je uit. Ontspan!
onboarding-stay_aligned-relaxed_poses-flat-step-1-v2 = 2. Druk op de knop "Houding opslaan".
onboarding-stay_aligned-relaxed_poses-skip_step = Overslaan
onboarding-stay_aligned-done-title = Blijf in lijn ingeschakeld!
onboarding-stay_aligned-done-description = Je Blijf in lijn-instelling is voltooid!
onboarding-stay_aligned-done-description-2 = De setup is voltooid! Je kunt het proces opnieuw starten als je de houdingen opnieuw wilt kalibreren.
onboarding-stay_aligned-previous_step = Vorige
onboarding-stay_aligned-next_step = Volgende
onboarding-stay_aligned-restart = Herstarten
onboarding-stay_aligned-done = Klaar
## Home
@@ -1189,6 +1365,11 @@ status_system-StatusSteamVRDisconnected =
}
status_system-StatusTrackerError = De { $trackerName } tracker heeft een error.
status_system-StatusUnassignedHMD = De VR-headset moet worden toegewezen als hoofdtracker.
status_system-StatusPublicNetwork =
{ $count ->
[one] Je netwerkprofiel staat momenteel ingesteld op Openbaar ({ $adapters }). Dit wordt niet aanbevolen voor een goede werking van SlimeVR. <PublicFixLink>Hier lees je hoe je het kunt oplossen.</PublicFixLink>
*[other] Sommige van je netwerkadapters staan ingesteld op openbaar: { $adapters }. Dit wordt niet aanbevolen voor een goede werking van SlimeVR. <PublicFixLink>Hier lees je hoe je dit kunt oplossen.</PublicFixLink>
}
## Firmware tool globals
@@ -1201,7 +1382,7 @@ firmware_tool-loading = Laden...
## Firmware tool Steps
firmware_tool = DIY firmware-tool
firmware_tool-description = Hiermee kunt u uw DIY-trackers configureren en flashen
firmware_tool-description = Hiermee kan je uw DIY-trackers configureren en flashen
firmware_tool-not_available = Oeps, de firmwaretool is momenteel niet beschikbaar. Kom later terug!
firmware_tool-not_compatible = De firmwaretool is niet compatibel met deze versie van de server. Gelieve te updaten!
firmware_tool-board_step = Selecteer je bord
@@ -1287,6 +1468,7 @@ firmware_tool-build_step = Aan het bouwen
firmware_tool-build_step-description = De firmware wordt gebouwd, even geduld a.u.b.
firmware_tool-flashing_step = Firmware aan het uploaden
firmware_tool-flashing_step-description = Je trackers worden geflashed, volg de instructies op het scherm
firmware_tool-flashing_step-warning-v2 = Koppel de tracker niet los en zet hem niet uit tijdens het uploadproces, tenzij dit wordt aangegeven. Dit kan je apparaat onbruikbaar maken.
firmware_tool-flashing_step-flash_more = Flash meer trackers
firmware_tool-flashing_step-exit = Sluit
@@ -1304,6 +1486,7 @@ firmware_tool-build-ERROR = Kan de firmware niet bouwen
## Firmware update status
firmware_update-status-DOWNLOADING = Firmware wordt gedownload
firmware_update-status-NEED_MANUAL_REBOOT-v2 = Zet je tracker uit en daarna weer aan.
firmware_update-status-AUTHENTICATING = Authenticatie met de mcu
firmware_update-status-UPLOADING = Firmware wordt geüpload
firmware_update-status-SYNCING_WITH_MCU = Synchroniseren met de mcu
@@ -1356,6 +1539,46 @@ unknown_device-modal-title = Er is een nieuwe tracker gevonden!
unknown_device-modal-description = Er is een nieuwe tracker gevonden met MAC-adres <b>{ $deviceId }</b>. Wil je deze verbinden met SlimeVR?
unknown_device-modal-confirm = Tuurlijk!
unknown_device-modal-forget = Negeer het
# VRChat config warnings
vrc_config-page-title = VRChat-configuratie waarschuwingen
vrc_config-page-desc = Deze pagina toont de status van je VRChat-instellingen en welke instellingen niet compatibel zijn met SlimeVR. Het wordt sterk aanbevolen om eventuele waarschuwingen hier te verhelpen voor de beste gebruikservaring met SlimeVR.
vrc_config-page-help = Kan je de instellingen niet finden?
vrc_config-page-help-desc = Bekijk onze <a>documentatie over dit onderwerp!</a>
vrc_config-page-big_menu = Tracking & IK (Hoofdmenu)
vrc_config-page-big_menu-desc = IK-instellingen in het hoofdmenu
vrc_config-page-wrist_menu = Tracking & IK (Polsmenu)
vrc_config-page-wrist_menu-desc = IK-instellingen in het kleine polsmenu
vrc_config-on = Aan
vrc_config-off = Uit
vrc_config-invalid = Je VRChat-instellingen zijn verkeerd geconfigureerd!
vrc_config-show_more = Toon meer
vrc_config-setting_name = Naam van de VRChat-instelling
vrc_config-recommended_value = Aanbevolen waarde
vrc_config-current_value = Huidige waarde
vrc_config-mute = Waarschuwing dempen
vrc_config-mute-btn = Dempen
vrc_config-unmute-btn = Dempen opheffen
vrc_config-legacy_mode = Use Legacy IK Solving
vrc_config-disable_shoulder_tracking = Disable Shoulder Tracking
vrc_config-shoulder_width_compensation = Shoulder Width Compensation
vrc_config-spine_mode = FBT Spine Mode
vrc_config-tracker_model = FBT Tracker Model
vrc_config-avatar_measurement_type = Avatar Measurement
vrc_config-calibration_range = Calibration Range
vrc_config-calibration_visuals = Display Calibration Visuals
vrc_config-user_height = User Real Height
vrc_config-spine_mode-UNKNOWN = Onbekend
vrc_config-spine_mode-LOCK_BOTH = Lock Both
vrc_config-spine_mode-LOCK_HEAD = Lock Head
vrc_config-spine_mode-LOCK_HIP = Lock Hip
vrc_config-tracker_model-UNKNOWN = Onbekend
vrc_config-tracker_model-AXIS = Axis
vrc_config-tracker_model-BOX = Box
vrc_config-tracker_model-SPHERE = Sphere
vrc_config-tracker_model-SYSTEM = Systeem
vrc_config-avatar_measurement_type-UNKNOWN = Onbekend
vrc_config-avatar_measurement_type-HEIGHT = Height
vrc_config-avatar_measurement_type-ARM_SPAN = Arm Span
## Error collection consent modal
+76 -1
View File
@@ -268,6 +268,7 @@ navbar-settings = Ustawienia
bvh-start_recording = Nagraj BVH
bvh-recording = Nagrywanie...
bvh-save_title = Zapisz nagranie BVH
## Tracking pause
@@ -308,6 +309,7 @@ widget-imu_visualizer-rotation_raw = Raw
widget-imu_visualizer-rotation_preview = Podgląd
widget-imu_visualizer-acceleration = Akceleracja
widget-imu_visualizer-position = Pozycja
widget-imu_visualizer-stay_aligned = Wyrównywanie
## Widget: Skeleton Visualizer
@@ -335,6 +337,7 @@ tracker-table-column-temperature = Temp. °C
tracker-table-column-linear-acceleration = Akceleracja X/Y/Z
tracker-table-column-rotation = Rotacja X/Y/Z
tracker-table-column-position = Pozycja X/Y/Z
tracker-table-column-stay_aligned = Wyrównywanie
tracker-table-column-url = URL
## Tracker rotation
@@ -403,6 +406,7 @@ tracker-settings-forget-label = Zapomnij o trackerze
tracker-settings-update-unavailable = Nie można zaktualizować (zrób to sam)
tracker-settings-update-low-battery = Nie można zaktualizować. Bateria poniżej 50%
tracker-settings-update-up_to_date = Aktualny
tracker-settings-update-blocked = Aktualizacja niedostępna. Brak innych wersji
tracker-settings-update-available = Wersja { $versionName } jest już dostępna
tracker-settings-update = Zaktualizuj teraz
tracker-settings-update-title = Wersja oprogramowania
@@ -472,6 +476,7 @@ mounting_selection_menu-close = Zamknij
settings-sidebar-title = Ustawienia
settings-sidebar-general = Ogólne
settings-sidebar-tracker_mechanics = Mechanika trackerów
settings-sidebar-stay_aligned = Wyrównywanie
settings-sidebar-fk_settings = Ustawienia śledzenia
settings-sidebar-gesture_control = Sterowanie gestami
settings-sidebar-interface = Interfejs
@@ -481,7 +486,9 @@ settings-sidebar-utils = Narzędzia
settings-sidebar-serial = Konsola szeregowa
settings-sidebar-appearance = Wygląd
settings-sidebar-notifications = Powiadomienia
settings-sidebar-behavior = Zachowanie
settings-sidebar-firmware-tool = Narzędzie do oprogramowania sprzętowego DIY
settings-sidebar-vrc_warnings = Ostrzeżenia dotyczące konfiguracji VRChat
settings-sidebar-advanced = Zaawansowany
## SteamVR settings
@@ -563,6 +570,25 @@ settings-general-tracker_mechanics-use_mag_on_all_trackers-description =
Wykorzystuje magnetometr we wszystkich trackerach, które mają kompatybilne oprogramowanie sprzętowe, redukując dryf w stabilnych środowiskach magnetycznych.¶
Można wyłączyć dla każdego modułu śledzącego w ustawieniach modułu śledzącego. <b>Proszę nie wyłączać żadnego modułu śledzącego podczas przełączania!</b>
settings-general-tracker_mechanics-use_mag_on_all_trackers-label = Użyj magnetometru na trackerach
settings-stay_aligned = Wyrównywanie
settings-stay_aligned-description = Wyrównywanie zmniejsza efekt driftu, stopniowo dostosowując trackery do twoich zrelaksowanych póz.
settings-stay_aligned-setup-label = Konfiguracja Opcji Wyrównywania
settings-stay_aligned-setup-description = Musisz ukończyć konfigurację, aby włączyć opcję Wyrównywania.
settings-stay_aligned-warnings-drift_compensation = ⚠ Wyłącz kompensację Driftu, będzie ona kolidować z opcją Wyrównywania!
settings-stay_aligned-enabled-label = Dostosuj trackery
settings-stay_aligned-hide_yaw_correction-label = Ukryj dopasowanie (do porównania bez opcji Wyrównywania)
settings-stay_aligned-general-label = Ogólne
settings-stay_aligned-relaxed_poses-label = Zrelaksowane pozy
settings-stay_aligned-relaxed_poses-description = Opcja Wyrównywania wykorzystuje Twoje zrelaksowane pozy, aby utrzymać trackery w jednej linii. Użyj opcji "Konfiguracja Opcji Wyrównywania", aby zaktualizować te pozy.
settings-stay_aligned-relaxed_poses-standing = Dostosuj trackery w pozycji stojącej
settings-stay_aligned-relaxed_poses-sitting = Dostosuj trackery, siedząc na krześle
settings-stay_aligned-relaxed_poses-flat = Dostosuj trackery, siedząc na podłodze lub leżąc na plecach
settings-stay_aligned-relaxed_poses-save_pose = Zapisz pozę
settings-stay_aligned-relaxed_poses-reset_pose = Zresetuj Pozycję
settings-stay_aligned-relaxed_poses-close = Zamknij
settings-stay_aligned-debug-label = Debugowanie
settings-stay_aligned-debug-description = Proszę dołączać ustawienia, podczas zgłaszania problemów z opcją Wyrównywania.
settings-stay_aligned-debug-copy-label = Skopiuj ustawienia do schowka
## FK/Tracking settings
@@ -725,6 +751,9 @@ settings-interface-behavior-error_tracking-description_v2 =
Aby zapewnić jak najlepsze wrażenia użytkownika, gromadzimy anonimowe raporty o błędach, wskaźniki wydajności i informacje o systemie operacyjnym. Pomaga nam to wykrywać błędy i problemy ze SlimeVR. Dane te są zbierane za pomocą Sentry.io.
settings-interface-behavior-error_tracking-label = Wysyłanie błędów do deweloperów
settings-interface-behavior-bvh_directory = Ścieżka do zapisywania nagrań BVH
settings-interface-behavior-bvh_directory-description = Wybierz ścieżkę domyślną, w której chcesz zapisywać nagrania BVH.
settings-interface-behavior-bvh_directory-label = Ścieżka do nagrań BVH
## Serial settings
@@ -788,6 +817,7 @@ settings-osc-vrchat-description-v1 =
settings-osc-vrchat-enable = Zezwól
settings-osc-vrchat-enable-description = Zezwól na wysyłanie i odbieranie danych.
settings-osc-vrchat-enable-label = Zezwól
settings-osc-vrchat-oscqueryEnabled = Włącz OSCQuery
settings-osc-vrchat-oscqueryEnabled-description =
OSCQuery automatycznie wykrywa uruchomione instancje VRChat i wysyła im dane.
Może również reklamować się do nich w celu otrzymania danych HMD i administratora.
@@ -994,7 +1024,7 @@ onboarding-connect_tracker-next = Połączyłem już wszystkie trackery
onboarding-calibration_tutorial = Samouczek kalibracji IMU
onboarding-calibration_tutorial-subtitle = Pomoże to ograniczyć dryf trackera!
onboarding-calibration_tutorial-description = Za każdym razem, gdy włączasz trackery, muszą one chwilę polerzeć na płaskiej powierzchni, aby się skalibrować. Zróbmy to samo, klikając przycisk „Kalibruj”, <b>nie ruszaj ich!</b>
onboarding-calibration_tutorial-description-v1 = Po włączeniu trackerów umieść je na chwilę na stabilnej powierzchni, aby umożliwić kalibrację. Kalibrację można przeprowadzić w dowolnym momencie po włączeniu trackerów - ta strona zawiera po prostu samouczek. Aby rozpocząć, kliknij przycisk "{ onboarding-calibration_tutorial-calibrate }", a następnie <b>nie ruszaj swoich trackerów!</b>
onboarding-calibration_tutorial-calibrate = Położyłem trackery na stole
onboarding-calibration_tutorial-status-waiting = Czekam na Ciebie
onboarding-calibration_tutorial-status-calibrating = Kalibracja
@@ -1165,6 +1195,9 @@ onboarding-automatic_mounting-mounting_reset-title = Kalibracja Pozycji
onboarding-automatic_mounting-mounting_reset-step-0 = 1. Zrób pozycje "na Małysza" z wygiętymi nogami, tułowiem pochylonym do przodu z wygiętymi rękami.
onboarding-automatic_mounting-mounting_reset-step-1 = 2. Naciśnij "Zresetuj Położenie" i poczekaj 3 sekundy zanim trackery się zresetują.
onboarding-automatic_mounting-preparation-title = Przygotowania
onboarding-automatic_mounting-preparation-v2-step-0 = 1. Naciśnij przycisk "Pełny reset".
onboarding-automatic_mounting-preparation-v2-step-1 = 2. Stań prosto z rękami po bokach. Upewnij się, że patrzysz przed siebie.
onboarding-automatic_mounting-preparation-v2-step-2 = 3. Utrzymaj pozycję, aż skończy się 3-sekundowy timer.
onboarding-automatic_mounting-put_trackers_on-title = Załóż trackery
onboarding-automatic_mounting-put_trackers_on-description = Aby skalibrować rotacje, użyjemy trackerów które przypisano przed chwilą. Załóż wszystkie trackery, możesz je odróznić na postaci po prawej.
onboarding-automatic_mounting-put_trackers_on-next = Wszystkie trackery założone
@@ -1298,6 +1331,37 @@ onboarding-scaled_proportions-done-description = Proporcje Twojego ciała powinn
## Stay Aligned setup
onboarding-stay_aligned-title = Wyrównywanie
onboarding-stay_aligned-description = Skonfiguruj opcję Wyrównywania, aby Twoje trackery były wyrównane.
onboarding-stay_aligned-put_trackers_on-title = Załóż trackery
onboarding-stay_aligned-put_trackers_on-description = Aby skalibrować proporcje, użyjemy trackerów które przed chwilą przypisałeś. Załóż wszystkie trackery, będziesz widział który to który na postaci po prawej.
onboarding-stay_aligned-put_trackers_on-trackers_warning = Masz mniej niż 5 trackerów aktualnie podłączonych i przypisanych! Jest to minimalna liczba elementów śledzących wymaganych do prawidłowego działania opcji Wyrównywania.
onboarding-stay_aligned-put_trackers_on-next = Mam wszystkie trackery założone
onboarding-stay_aligned-verify_mounting-title = Sprawdź swój montaż
onboarding-stay_aligned-verify_mounting-step-0 = Opcja Wyrównywania wymaga stabilnego mocowania trackera. W innym przypadku będziesz miał złe rezultaty.
onboarding-stay_aligned-verify_mounting-step-1 = 1. Poruszaj się podczas stania.
onboarding-stay_aligned-verify_mounting-step-2 = 2. Usiądź i poruszaj nogami i stopami.
onboarding-stay_aligned-verify_mounting-step-3 = 3. Jeśli Twoje trackery nie znajdują się we właściwym miejscu, naciśnij "Ponów kalibrację montażu".
onboarding-stay_aligned-verify_mounting-redo_mounting = Ponów kalibrację montażu
onboarding-stay_aligned-preparation-title = Przygotowania
onboarding-stay_aligned-preparation-tip = Upewnij się, że stoisz prosto. Patrz przed siebie z rękami opuszczonymi po bokach.
onboarding-stay_aligned-relaxed_poses-standing-title = Zrelaksowana pozycja stojąca
onboarding-stay_aligned-relaxed_poses-standing-step-0 = 1. Stań w wygodnej pozycji. Zrelaksuj się!
onboarding-stay_aligned-relaxed_poses-standing-step-1-v2 = 2. Naciśnij przycisk "Zapisz pozę".
onboarding-stay_aligned-relaxed_poses-sitting-title = Zrelaksowana pozycja siedząca na krześle
onboarding-stay_aligned-relaxed_poses-sitting-step-0 = 1. Usiądź w wygodnej pozycji. Zrelaksuj się!
onboarding-stay_aligned-relaxed_poses-sitting-step-1-v2 = 2. Naciśnij przycisk "Zapisz pozę".
onboarding-stay_aligned-relaxed_poses-flat-title = Zrelaksowana pozycja siedząca na podłodze
onboarding-stay_aligned-relaxed_poses-flat-step-0 = 1. Usiądź na podłodze z nogami wysuniętymi do przodu. Zrelaksuj się!
onboarding-stay_aligned-relaxed_poses-flat-step-1-v2 = 2. Naciśnij przycisk "Zapisz pozę".
onboarding-stay_aligned-relaxed_poses-skip_step = Pomiń
onboarding-stay_aligned-done-title = Wyrównywanie Włączone!
onboarding-stay_aligned-done-description = Konfiguracja Wyrównywania jest zakończona!
onboarding-stay_aligned-done-description-2 = Konfiguracja została zakończona! Możesz ponownie uruchomić proces, jeśli chcesz ponownie skalibrować pozy.
onboarding-stay_aligned-previous_step = Poprzednie
onboarding-stay_aligned-next_step = Następne
onboarding-stay_aligned-restart = Restart
onboarding-stay_aligned-done = Gotowy
## Home
@@ -1322,6 +1386,12 @@ status_system-StatusSteamVRDisconnected =
}
status_system-StatusTrackerError = Tracker { $trackerName } ma błąd.
status_system-StatusUnassignedHMD = Headset powinien być przypisany do śledzenia głowy.
status_system-StatusPublicNetwork =
{ $count ->
[one] Twoja karta sieciowa jest ustawiona jako publiczna: { $adapters }. Nie jest to zalecane, aby SlimeVR działał poprawnie. <PublicFixLink>Zobacz, jak to naprawić tutaj.</PublicFixLink>
[few] Niektóre karty sieciowe są ustawione jako publiczne: { $adapters }. Nie jest to zalecane, aby SlimeVR działał poprawnie. <PublicFixLink>Zobacz, jak to naprawić tutaj.</PublicFixLink>
*[many] Dużo twoich karty sieciowych jest ustawionych jako publiczne: { $adapters }. Nie jest to zalecane, aby SlimeVR działał poprawnie. <PublicFixLink>Zobacz, jak to naprawić tutaj.</PublicFixLink>
}
## Firmware tool globals
@@ -1423,6 +1493,7 @@ firmware_tool-build_step = Building
firmware_tool-build_step-description = Trwa tworzenie oprogramowania sprzętowego. Proszę czekać
firmware_tool-flashing_step = Flashing
firmware_tool-flashing_step-description = Twoje trackery migają. Postępuj zgodnie z instrukcjami wyświetlanymi na ekranie
firmware_tool-flashing_step-warning-v2 = Nie odłączaj ani nie wyłączaj trackera podczas procesu przesyłania, chyba że zostaniesz o to poproszony, może to spowodować, że twoje urządzenie stanie się bezużyteczne.
firmware_tool-flashing_step-flash_more = Flashuj więcej trackerów
firmware_tool-flashing_step-exit = Wyjście
@@ -1440,6 +1511,7 @@ firmware_tool-build-ERROR = Nie można zbudować oprogramowania sprzętowego
## Firmware update status
firmware_update-status-DOWNLOADING = Pobieranie oprogramowania sprzętowego
firmware_update-status-NEED_MANUAL_REBOOT-v2 = Wyłącz i ponownie włącz swój tracker
firmware_update-status-AUTHENTICATING = Uwierzytelnianie za pomocą MCU
firmware_update-status-UPLOADING = Przesyłanie oprogramowania sprzętowego
firmware_update-status-SYNCING_WITH_MCU = Synchronizacja z MCU
@@ -1510,6 +1582,9 @@ vrc_config-show_more = Pokaż więcej
vrc_config-setting_name = Nazwa ustawienia VRChat
vrc_config-recommended_value = Zalecana wartość
vrc_config-current_value = Bieżąca wartość
vrc_config-mute = Wycisz Ostrzeżenie
vrc_config-mute-btn = Wycisz
vrc_config-unmute-btn = Odcisz
vrc_config-legacy_mode = Korzystanie ze starszego rozwiązywania kinematyki odwrotnej
vrc_config-disable_shoulder_tracking = Wyłącz śledzenie ramienia
vrc_config-shoulder_width_compensation = Kompensacja szerokości barku
+1 -4
View File
@@ -53,7 +53,7 @@ body_part-LEFT_LOWER_ARM = แขนซ้ายส่วนล่าง
body_part-LEFT_HAND = มือซ้าย
body_part-LEFT_UPPER_LEG = ต้นขาซ้าย
body_part-LEFT_LOWER_LEG = ข้อเท้าซ้าย
body_part-LEFT_FOOT = เท้าขวา
body_part-LEFT_FOOT = เท้าซ้าย
body_part-LEFT_THUMB_METACARPAL = ฝ่ามือนิ้วโป้งซ้าย
body_part-LEFT_THUMB_PROXIMAL = โคนนิ้วโป้งซ้าย
body_part-LEFT_THUMB_DISTAL = ปลายนิ้วโป้งซ้าย
@@ -992,9 +992,6 @@ onboarding-connect_tracker-next = ฉันเชื่อมต่อแทร
onboarding-calibration_tutorial = บทเรียนการปรับเทียบ IMU
onboarding-calibration_tutorial-subtitle = นี่จะเป็นการช่วยลดค่าดริฟท์ของแทร็กเกอร์
onboarding-calibration_tutorial-description =
ทุกครั้งที่มีการใช้แทร็กเกอร์ คุณควรจะวางไว้บนพื้นเรียบสักครู่เพื่อเริ่มต้นการปรับเทียบ งั้นเรามาทำแบบนั้นกันเลยด้วยการคลิกไปที่
"{ onboarding-calibration_tutorial-calibrate }" <b>และอย่าขยับมัน!</b>
onboarding-calibration_tutorial-calibrate = ฉันได้วางแทร็กเกอร์ไว้บนโต๊ะแล้ว
onboarding-calibration_tutorial-status-waiting = เรารอคุณอยู่
onboarding-calibration_tutorial-status-calibrating = กำลังปรับเทียบ
+44 -55
View File
@@ -9,6 +9,11 @@
websocket-connecting = Đang kết nối với máy chủ
websocket-connection_lost = Kết nối với máy chủ đã mất. Đang kết nối lại...
websocket-connection_lost-desc = Máy chủ SlimeVR bị dừng. Hãy kiểm tra nhật ký logs và khởi động lại chương trình.
websocket-timedout = Không thể tìm thấy máy chủ
websocket-timedout-desc = Có vẻ như máy chủ SlimeVR đã bị sập hoặc hết thời gian chờ. Vui lòng kiểm tra nhật ký logs và khởi động lại chương trình.
websocket-error-close = Thoát SlimeVR
websocket-error-logs = Mở thư mục nhật ký logs
## Update notification
@@ -50,6 +55,11 @@ body_part-LEFT_UPPER_LEG = Bắp chân trái
body_part-LEFT_LOWER_LEG = Cẳng chân trái
body_part-LEFT_FOOT = Bàn chân trái
## BoardType
board_type-MOCOPI = Sony Mocopi
board_type-WEMOSWROOM02 = Wemos Wroom-02 D1 Mini
## Proportions
skeleton_bone-NONE = Chưa được gán
@@ -421,9 +431,6 @@ settings-general-fk_settings-skeleton_settings-interp_knee_tracker_ankle = Tính
settings-general-fk_settings-skeleton_settings-interp_knee_ankle = Tính trung bình của chiều quay đầu gối ngáp và lăn bằng mắt cá chân '
settings-general-fk_settings-self_localization-title = Chế độ Mocap
settings-general-fk_settings-self_localization-description = Chế độ Mocap cho phép bộ xương theo dõi đại khái vị trí của chính nó mà không cần kính VR hoặc các thiết bị theo dõi khác. Lưu ý rằng điều này yêu cầu bộ theo dõi chân và đầu để hoạt động và chức năng này vẫn đang trong quá trình thử nghiệm.
settings-general-fk_settings-vive_emulation-title = Giả lập tracker Vive
settings-general-fk_settings-vive_emulation-description = Giả lập cách tracker của Vive gặp vấn đề với việc theo dõi eo, đây là 1 tính năng được làm cho vui và sẽ làm giảm độ chính xác
settings-general-fk_settings-vive_emulation-label = Giả lập tracker Vive
## Gesture control settings (tracker tapping)
@@ -485,6 +492,12 @@ settings-general-interface-feedback_sound-volume = Âm lượng phản hồi
settings-general-interface-connected_trackers_warning = Cảnh báo với thiết bị đã kết nối
settings-general-interface-connected_trackers_warning-description = Tùy chọn này sẽ hiển thị cửa sổ bật lên mỗi khi bạn thử thoát khỏi SlimeVR trong khi có một hoặc nhiều thiết bị theo dõi được kết nối. Nó nhắc nhở bạn tắt trình theo dõi khi bạn hoàn tất để duy trì tuổi thọ pin.
settings-general-interface-connected_trackers_warning-label = Cảnh báo thiết bị đã kết nối khi thoát chương trình
## Behavior settings
settings-general-interface-dev_mode = Chế độ nhà phát triển
settings-general-interface-dev_mode-description = Hữu dụng nếu cần thêm thông tin chi tiết của tracker hay can thiệp sâu hơn vào tracker
settings-general-interface-dev_mode-label = Chế độ nhà phát triển
settings-general-interface-use_tray = Thu nhỏ vào khay hệ thống
settings-general-interface-use_tray-description = Cho phép bạn đóng cửa sổ mà không cần đóng máy chủ SlimeVR để bạn có thể tiếp tục sử dụng nó mà không bị GUI làm phiền.
settings-general-interface-use_tray-label = Thu nhỏ vào khay hệ thống
@@ -601,12 +614,6 @@ settings-osc-vmc-network-address-description = Chọn địa chỉ để gửi d
settings-osc-vmc-network-address-placeholder = Địa chỉ IPV4
settings-osc-vmc-vrm = Model VRM
settings-osc-vmc-vrm-description = Tải mô hình VRM để cho phép neo đầu và cho phép khả năng tương thích cao hơn với các ứng dụng khác.
settings-osc-vmc-vrm-model_unloaded = Chưa có mô hình tải lên
settings-osc-vmc-vrm-model_loaded =
{ $titled ->
[true] Mô hình đã được tải: { $name }
*[other] Mô hình chưa có tiêu đề đã được tải
}
settings-osc-vmc-vrm-file_select = Kéo và thả mô hình để sử dụng hoặc <u>duyệt file</u>
settings-osc-vmc-anchor_hip = Cố định ở hông
settings-osc-vmc-anchor_hip-description = Cố định theo dõi ở hông, hữu ích cho VTubing ngồi. Nếu tắt, hãy tải mô hình VRM.
@@ -622,8 +629,6 @@ settings-utils-advanced-reset-gui = Đặt lại cài đặt GUI
settings-utils-advanced-reset-all-label = Đặt lại tất cả
settings-utils-advanced-reset_warning-reset = Đặt lại cài đặt
settings-utils-advanced-reset_warning-cancel = Hủy
settings-utils-advanced-open_data = Thư mục dữ liệu
settings-utils-advanced-open_data-description = Mở thư mục dữ liệu của SlimeVR trong tệp, chứa các tệp cấu hình và logs.
settings-utils-advanced-open_data-label = Mở thư mục
## Setup/onboarding menu
@@ -731,7 +736,6 @@ onboarding-connect_tracker-next = Đã kết nối với tất cả tracker
onboarding-calibration_tutorial = Hướng dẫn hiệu chuẩn IMU
onboarding-calibration_tutorial-subtitle = Cái này sẽ giúp giảm trôi trượt theo dõi!
onboarding-calibration_tutorial-description = Mỗi khi bạn bật thiết bị theo dõi, chúng cần nghỉ ngơi một lúc trên bề mặt phẳng để hiệu chỉnh. Hãy làm điều tương tự bằng cách nhấp vào nút "{ onboarding-calibration_tutorial-calibrate }", <b>và không di chuyển chúng!</b>
onboarding-calibration_tutorial-calibrate = Tôi đã đặt thiết bị theo dõi của mình lên bàn
onboarding-calibration_tutorial-status-waiting = Đang chờ bạn hoàn thành
onboarding-calibration_tutorial-status-calibrating = Đang hiệu chuẩn
@@ -895,44 +899,14 @@ onboarding-automatic_mounting-mounting_reset-title = Đặt lại hướng gắn
onboarding-automatic_mounting-mounting_reset-step-0 = 1. Đứng khom người như tư thế trượt tuyết với đầu gối khom lại, thân trên hướng tới trước và hai tay co lại để giữ thăng bằng như hình bên
onboarding-automatic_mounting-mounting_reset-step-1 = 2. Nhấn nút đặt lại và chờ 3 giây trước khi hệ thống cân chỉnh hướng gắn tracker
onboarding-automatic_mounting-preparation-title = Chuẩn bị tư thế
onboarding-automatic_mounting-preparation-step-0 = 1. Đứng thẳng với hai tay duỗi thẳng
onboarding-automatic_mounting-preparation-step-1 = 2. Nhấn nút đặt lại và chờ 3 giây trước khi tracker được đặt lại.
onboarding-automatic_mounting-put_trackers_on-title = Đeo tracker lên người
onboarding-automatic_mounting-put_trackers_on-description = Để cân chỉnh hướng gắn của tracker, SlimeVR sẽ tiến hành đo góc nghiêng của tracker khi đang đeo để cân chỉnh hướng gắn, hãy đeo tracker theo đúng vị trí đã thiết lập
onboarding-automatic_mounting-put_trackers_on-next = Tiếp tục
## Tracker proportions method choose
onboarding-choose_proportions = Phương pháp hiệu chuẩn tỷ lệ nào để sử dụng?
# Multiline string
onboarding-choose_proportions-description-v1 =
Tỷ lệ cơ thể được sử dụng để biết các số đo của cơ thể bạn. Họ được yêu cầu tính toán vị trí của trình theo dõi.
Khi tỷ lệ cơ thể của bạn không khớp với tỷ lệ được lưu, độ chính xác theo dõi của bạn sẽ kém hơn và bạn sẽ nhận thấy những thứ như trượt băng hoặc trượt, hoặc cơ thể của bạn không khớp với hình đại diện của bạn.
<b>Bạn chỉ cần đo cơ thể của bạn một lần!</b> Trừ khi chúng sai hoặc cơ thể bạn đã thay đổi, thì bạn không cần phải làm lại.
onboarding-choose_proportions-auto_proportions = Đo kích thước cơ thể tự động
# Italicized text
onboarding-choose_proportions-auto_proportions-subtitle = Khuyến khích dùng
onboarding-choose_proportions-auto_proportions-descriptionv3 =
Tính năng này sẽ đoán tỷ lệ cơ thể của bạn bằng cách ghi lại một mẫu chuyển động của bạn và chuyển nó qua một thuật toán.
<b>Tính năng này sẽ yêu cầu headset của bạn (HMD) được kết nối với SlimeVR và đang nằm ở trên đầu của bạn!</b>
onboarding-choose_proportions-manual_proportions = Đo kích thước cơ thể thủ công
# Italicized text
onboarding-choose_proportions-manual_proportions-subtitle = Cho chính xác
onboarding-choose_proportions-manual_proportions-description = Tính năng này sẽ cho phép bạn điều chỉnh tỉ lệ cơ thể của mình theo cách thủ công bằng cách chỉnh sửa các con số một cách trực tiếp
onboarding-choose_proportions-export = Xuất tỉ lệ cơ thể
onboarding-choose_proportions-import = Nhập tỉ lệ cơ thể
onboarding-choose_proportions-import-success = Đã được nhập
onboarding-choose_proportions-import-failed = Thất bại
onboarding-choose_proportions-file_type = File tỉ lệ cơ thể
## Tracker manual proportions setup
## Tracker manual proportions setupa
onboarding-manual_proportions-back = Quay lại cân chỉnh hướng gắn
onboarding-manual_proportions-title = Đo kích thước cơ thể thủ công
onboarding-manual_proportions-precision = Cân chỉnh cụ thể (giảm hệ số chỉnh)
onboarding-manual_proportions-auto = Đo kích thước cơ thể tự động
onboarding-manual_proportions-ratio = Điều chỉnh theo nhóm tỷ lệ
## Tracker automatic proportions setup
@@ -953,20 +927,11 @@ onboarding-automatic_proportions-requirements-descriptionv2 =
Headset của bạn đang báo cáo dữ liệu vị trí cho máy chủ SlimeVR (điều này thường có nghĩa là SteamVR đang chạy và kết nối với SlimeVR bằng driver SteamVR của SlimeVR).
Tracking của bạn đang hoạt động và thể hiện chính xác các chuyển động của bạn (ví dụ: bạn đã thực hiện thiết đặt lại hoàn toàn và chúng di chuyển đúng hướng khi đá, cúi xuống, ngồi, v.v.).
onboarding-automatic_proportions-requirements-next = Tôi đã đọc các yêu cầu
onboarding-automatic_proportions-check_height-title = Kiểm tra chiều cao của bạn
onboarding-automatic_proportions-check_height-description = Chúng tôi sử dụng chiều cao của bạn làm cơ sở cho các phép đo của chúng tôi bằng cách sử dụng chiều cao của headset (HMD) làm chiều cao ước tính thực tế của bạn, nhưng tốt hơn hết bạn nên tự kiểm tra xem chúng có đúng không!
# All the text is in bold!
onboarding-automatic_proportions-check_height-calculation_warning = Vui lòng nhấn nút trong khi đứng <u>thẳng</u> để tính chiều cao của bạn. Bạn có 3 giây sau khi nhấn nút!
onboarding-automatic_proportions-check_height-guardian_tip =
Nếu bạn đang sử dụng Kính VR Standalone, hãy đảm bảo có guardian /
Ranh giới được bật để chiều cao của bạn là chính xác!
onboarding-automatic_proportions-check_height-fetch_height = Tôi đang đứng!
# Context is that the height is unknown
onboarding-automatic_proportions-check_height-unknown = Không rõ
# Shows an element below it
onboarding-automatic_proportions-check_height-hmd_height1 = Chiều cao của HMD là
# Shows an element below it
onboarding-automatic_proportions-check_height-height1 = vậy chiều cao thật của bạn là
onboarding-automatic_proportions-check_height-next_step = Những chỉ số này là đúng
onboarding-automatic_proportions-start_recording-title = Chuẩn bị đo
onboarding-automatic_proportions-start_recording-description = Phần mềm sẽ đo một số chuyển động, cử chỉ cụ thể, hãy chuẩn bị cho việc di chuyển theo yêu cầu trong phần tiếp theo
@@ -997,11 +962,17 @@ onboarding-automatic_proportions-verify_results-redo = Thử lại
onboarding-automatic_proportions-verify_results-confirm = Kết quả tương đối chính xác
onboarding-automatic_proportions-done-title = Đã lưu chỉ số đo
onboarding-automatic_proportions-done-description = Quá trình đo đã hoàn tất
onboarding-automatic_proportions-error_modal =
<b>Lưu ý:</b> Một lỗi đã được tìm thấy trong khi ước tính tỷ lệ cơ thể!
Vui lòng <docs>kiểm tra hướng dẫn</docs> hoặc tham gia <discord>Discord</discord> của chúng tôi để được trợ giúp ^_^
onboarding-automatic_proportions-error_modal-confirm = Đã hiểu!
## Tracker scaled proportions setup
## Tracker scaled proportions reset
## Stay Aligned setup
## Home
home-no_trackers = Chưa có thiết bị nào được phát hiện hoặc điều ra
@@ -1026,6 +997,21 @@ status_system-StatusSteamVRDisconnected =
status_system-StatusTrackerError = Tracker { $trackerName } có lỗi.
status_system-StatusUnassignedHMD = Kính thực tế ảo VR này nên được giao là bộ theo dõi đầu.
## Firmware tool globals
## Firmware tool Steps
## firmware tool build status
## Firmware update status
## Dedicated Firmware Update Page
## Tray Menu
tray_menu-show = Xem
@@ -1053,3 +1039,6 @@ unknown_device-modal-description =
Bạn có muốn kết nối nó với SlimeVR không?
unknown_device-modal-confirm = Chắc!
unknown_device-modal-forget = Bỏ qua
## Error collection consent modal
+12 -4
View File
@@ -233,6 +233,8 @@ reset-reset_all_warning_default-v2 =
您确定要执行此操作吗?
reset-full = 完整重置
reset-mounting = 重置佩戴
reset-mounting-feet = 重置脚部佩戴
reset-mounting-fingers = 重置手指佩戴
reset-yaw = 重置航向轴
## Serial detection stuff
@@ -258,6 +260,7 @@ navbar-settings = 设置
bvh-start_recording = 录制 BVH 文件
bvh-recording = 录制中...
bvh-save_title = 保存BVH记录
## Tracking pause
@@ -395,6 +398,7 @@ tracker-settings-forget-label = 忘记追踪器
tracker-settings-update-unavailable = 无法升级(DIY)
tracker-settings-update-low-battery = 无法更新。当前电池电量低于 50%
tracker-settings-update-up_to_date = 已是最新
tracker-settings-update-blocked = 更新不可用。没有其他可用版本
tracker-settings-update-available = { $versionName } 现在可用
tracker-settings-update = 立即更新
tracker-settings-update-title = 固件版本
@@ -573,6 +577,7 @@ settings-stay_aligned-relaxed_poses-sitting = 椅子上放松姿势
settings-stay_aligned-relaxed_poses-flat = 地面/平躺放松姿势
settings-stay_aligned-relaxed_poses-save_pose = 保存姿势
settings-stay_aligned-relaxed_poses-reset_pose = 重置姿势
settings-stay_aligned-relaxed_poses-close = 关闭
settings-stay_aligned-debug-label = 调试
settings-stay_aligned-debug-description = 在报告持续校准相关问题时,请包含您的以下设置信息
settings-stay_aligned-debug-copy-label = 复制设置信息到剪贴板
@@ -727,6 +732,9 @@ settings-interface-behavior-error_tracking-description_v2 =
为了提供最佳用户体验,我们会收集匿名错误报告、性能指标和操作系统信息。这有助于我们检测 SlimeVR 的错误和问题。这些指标将通过 Sentry.io 收集。
settings-interface-behavior-error_tracking-label = 向开发人员发送错误信息
settings-interface-behavior-bvh_directory = BVH记录保存目录
settings-interface-behavior-bvh_directory-description = 选择保存BVH记录文件的目录
settings-interface-behavior-bvh_directory-label = BVH记录保存目录
## Serial settings
@@ -997,7 +1005,7 @@ onboarding-connect_tracker-next = 所有的追踪器都连接好了
onboarding-calibration_tutorial = IMU校准教程
onboarding-calibration_tutorial-subtitle = 这将有助于减少追踪器漂移!
onboarding-calibration_tutorial-description = 每次开启追踪器时,它们都需要在平坦的表面上放置片刻以进行自校准。你也可以通过点击“{ onboarding-calibration_tutorial-calibrate }”按钮来手动校准, <b>校准过程中不要移动追踪器!</b>
onboarding-calibration_tutorial-description-v1 = 打开追踪器后,将它们放在稳定的平面上一段时间,以便进行校准。追踪器开机后可随时进行校准 - 本页仅是一个校准教程。首先,点击 “{ onboarding-calibration_tutorial-calibrate }” 按钮,然后 <b>不要移动您的追踪器!</b>
onboarding-calibration_tutorial-calibrate = 我已经把追踪器放在桌子上了
onboarding-calibration_tutorial-status-waiting = 等待你的操作
onboarding-calibration_tutorial-status-calibrating = 校准中
@@ -1301,13 +1309,13 @@ onboarding-stay_aligned-preparation-title = 准备
onboarding-stay_aligned-preparation-tip = 站直并向前看,双臂放在身体两侧。
onboarding-stay_aligned-relaxed_poses-standing-title = 站立放松姿势
onboarding-stay_aligned-relaxed_poses-standing-step-0 = 1. 以舒适的姿势站立并放松。
onboarding-stay_aligned-relaxed_poses-standing-step-2 = 3. 按下“检测姿势”按钮。
onboarding-stay_aligned-relaxed_poses-standing-step-1-v2 = 2. 按下“保存姿势”按钮。
onboarding-stay_aligned-relaxed_poses-sitting-title = 椅子上放松姿势
onboarding-stay_aligned-relaxed_poses-sitting-step-0 = 1. 以舒适的姿势坐下并放松。
onboarding-stay_aligned-relaxed_poses-sitting-step-2 = 3. 按下“检测姿势”按钮。
onboarding-stay_aligned-relaxed_poses-sitting-step-1-v2 = 2. 按下“保存姿势”按钮。
onboarding-stay_aligned-relaxed_poses-flat-title = 地面/平躺放松姿势
onboarding-stay_aligned-relaxed_poses-flat-step-0 = 1. 以舒适的姿势坐或躺在地面上,保持腿在前方并放松。
onboarding-stay_aligned-relaxed_poses-flat-step-2 = 3. 按下“检测姿势”按钮。
onboarding-stay_aligned-relaxed_poses-flat-step-1-v2 = 2. 按下“保存姿势”按钮。
onboarding-stay_aligned-relaxed_poses-skip_step = 跳过
onboarding-stay_aligned-done-title = 持续校准已开启!
onboarding-stay_aligned-done-description = 持续校准已设定完成!
+1 -1
View File
@@ -31,7 +31,7 @@ serde = { version = "1", features = ["derive"] }
tauri = { version = "2.0", features = ["devtools", "tray-icon", "image-png", "rustls-tls"] }
tauri-runtime = "2.0"
tauri-plugin-dialog = "2.0"
tauri-plugin-fs = "2.0"
tauri-plugin-fs = "2.4.1"
tauri-plugin-os = "2.0"
tauri-plugin-shell = "2.0"
tauri-plugin-store = "2.0"
@@ -65,6 +65,10 @@ work. If not, see <http://creativecommons.org/publicdomain/zero/1.0/>.
</provides>
<releases>
<release version="0.16.2" date="2025-08-01"><url>https://github.com/SlimeVR/SlimeVR-Server/releases/tag/v0.16.2</url></release>
<release version="0.16.1" date="2025-07-27"><url>https://github.com/SlimeVR/SlimeVR-Server/releases/tag/v0.16.1</url></release>
<release version="0.16.1~rc.2" type="development" date="2025-07-17"><url>https://github.com/SlimeVR/SlimeVR-Server/releases/tag/v0.16.1-rc.2</url></release>
<release version="0.16.1~rc.1" type="development" date="2025-07-04"><url>https://github.com/SlimeVR/SlimeVR-Server/releases/tag/v0.16.1-rc.1</url></release>
<release version="0.16.0" date="2025-07-01"><url>https://github.com/SlimeVR/SlimeVR-Server/releases/tag/v0.16.0</url></release>
<release version="0.16.0~rc.2" type="development" date="2025-06-20"><url>https://github.com/SlimeVR/SlimeVR-Server/releases/tag/v0.16.0-rc.2</url></release>
<release version="0.16.0~rc.1" type="development" date="2025-05-27"><url>https://github.com/SlimeVR/SlimeVR-Server/releases/tag/v0.16.0-rc.1</url></release>
+17 -17
View File
@@ -5,6 +5,11 @@ import {
Route,
Routes,
} from 'react-router-dom';
import { Event, listen } from '@tauri-apps/api/event';
import * as os from '@tauri-apps/plugin-os';
import { open } from '@tauri-apps/plugin-shell';
import semver from 'semver';
import { withSentryReactRouterV6Routing } from '@sentry/react';
import { Home } from './components/home/Home';
import { MainLayout } from './components/MainLayout';
import { AppContextProvider } from './components/providers/AppContext';
@@ -16,7 +21,6 @@ import {
WebSocketApiContext,
} from './hooks/websocket-api';
import { Event, listen } from '@tauri-apps/api/event';
import { OnboardingContextProvider } from './components/onboarding/OnboardingContextProvicer';
import { OnboardingLayout } from './components/onboarding/OnboardingLayout';
import { AutomaticProportionsPage } from './components/onboarding/pages/body-proportions/AutomaticProportions';
@@ -36,15 +40,12 @@ import { VRCOSCSettings } from './components/settings/pages/VRCOSCSettings';
import { TopBar } from './components/TopBar';
import { TrackerSettingsPage } from './components/tracker/TrackerSettings';
import { OSCRouterSettings } from './components/settings/pages/OSCRouterSettings';
import * as os from '@tauri-apps/plugin-os';
import { VMCSettings } from './components/settings/pages/VMCSettings';
import { MountingChoose } from './components/onboarding/pages/mounting/MountingChoose';
import { StatusProvider } from './components/providers/StatusSystemContext';
import { VersionUpdateModal } from './components/VersionUpdateModal';
import { CalibrationTutorialPage } from './components/onboarding/pages/CalibrationTutorial';
import { AssignmentTutorialPage } from './components/onboarding/pages/assignment-preparation/AssignmentTutorial';
import { open } from '@tauri-apps/plugin-shell';
import semver from 'semver';
import { useBreakpoint, useIsTauri } from './hooks/breakpoint';
import { VRModePage } from './components/vr-mode/VRModePage';
import { InterfaceSettings } from './components/settings/pages/InterfaceSettings';
@@ -54,7 +55,6 @@ import { AppLayout } from './AppLayout';
import { Preload } from './components/Preload';
import { UnknownDeviceModal } from './components/UnknownDeviceModal';
import { useDiscordPresence } from './hooks/discord-presence';
import { withSentryReactRouterV6Routing } from '@sentry/react';
import { ScaledProportionsPage } from './components/onboarding/pages/body-proportions/ScaledProportions';
import { AdvancedSettings } from './components/settings/pages/AdvancedSettings';
import { FirmwareUpdate } from './components/firmware-update/FirmwareUpdate';
@@ -75,9 +75,9 @@ function Layout() {
return (
<>
<SerialDetectionModal></SerialDetectionModal>
<VersionUpdateModal></VersionUpdateModal>
<UnknownDeviceModal></UnknownDeviceModal>
<SerialDetectionModal />
<VersionUpdateModal />
<UnknownDeviceModal />
<SentryRoutes>
<Route element={<AppLayout />}>
<Route
@@ -158,7 +158,7 @@ function Layout() {
/>
<Route path="trackers-assign" element={<TrackersAssignPage />} />
<Route path="enter-vr" element={<EnterVRPage />} />
<Route path="mounting/choose" element={<MountingChoose />}></Route>
<Route path="mounting/choose" element={<MountingChoose />} />
<Route path="mounting/auto" element={<AutomaticMountingPage />} />
<Route path="mounting/manual" element={<ManualMountingPage />} />
<Route path="reset-tutorial" element={<ResetTutorialPage />} />
@@ -177,7 +177,7 @@ function Layout() {
<Route path="stay-aligned" element={<StayAlignedSetup />} />
<Route path="done" element={<DonePage />} />
</Route>
<Route path="*" element={<TopBar></TopBar>}></Route>
<Route path="*" element={<TopBar />} />
</Route>
</SentryRoutes>
</>
@@ -190,7 +190,7 @@ export default function App() {
const isTauri = useIsTauri();
useEffect(() => {
const onKeydown: (arg0: KeyboardEvent) => void = function (event) {
const onKeydown = (event: KeyboardEvent) => {
// prevent search bar keybind
if (
event.key === 'F3' ||
@@ -239,10 +239,11 @@ export default function App() {
'server-status',
(event: Event<[string, string]>) => {
const [eventType, s] = event.payload;
if ('stderr' === eventType) {
if (eventType === 'stderr') {
// This strange invocation is what lets us lose the line information in the console
// See more here: https://stackoverflow.com/a/48994308
// These two are fine to keep with console.log, they are server logs
/* eslint-disable no-console */
setTimeout(
console.log.bind(
console,
@@ -260,6 +261,7 @@ export default function App() {
'color:green'
)
);
/* eslint-enable no-console */
} else if (eventType === 'error') {
error('Error: %s', s);
} else if (eventType === 'terminated') {
@@ -278,7 +280,7 @@ export default function App() {
useEffect(() => {
function onKeyboard(ev: KeyboardEvent) {
if (ev.key === 'F1') {
return open(DOCS_SITE).catch(() => window.open(DOCS_SITE, '_blank'));
open(DOCS_SITE).catch(() => window.open(DOCS_SITE, '_blank'));
}
}
@@ -296,10 +298,8 @@ export default function App() {
<VersionContext.Provider value={updateFound}>
<div className="h-full w-full text-standard bg-background-80 text-background-10">
<Preload />
{!websocketAPI.isConnected && (
<ConnectionLost></ConnectionLost>
)}
{websocketAPI.isConnected && <Layout></Layout>}
{!websocketAPI.isConnected && <ConnectionLost />}
{websocketAPI.isConnected && <Layout />}
</div>
</VersionContext.Provider>
</StatusProvider>
+2 -6
View File
@@ -1,6 +1,6 @@
import { useLayoutEffect } from 'react';
import { useConfig } from './hooks/config';
import { Outlet, useNavigate } from 'react-router-dom';
import { useConfig } from './hooks/config';
export function AppLayout() {
const { config } = useConfig();
@@ -33,9 +33,5 @@ export function AppLayout() {
}
}, [config?.doneOnboarding]);
return (
<>
<Outlet />
</>
);
return <Outlet />;
}
+7 -5
View File
@@ -6,14 +6,16 @@ import {
RpcMessage,
} from 'solarxr-protocol';
import { useWebsocketAPI } from '@/hooks/websocket-api';
import { BigButton } from './commons/BigButton';
import { RecordIcon } from './commons/icon/RecordIcon';
import classNames from 'classnames';
import { isTauri } from '@tauri-apps/api/core';
import { save } from '@tauri-apps/plugin-dialog';
import { useConfig } from '@/hooks/config';
import { RecordIcon } from './commons/icon/RecordIcon';
import { BigButton } from './commons/BigButton';
export function BVHButton(props: React.HTMLAttributes<HTMLButtonElement>) {
export function BVHButton({
className,
}: React.HTMLAttributes<HTMLButtonElement>) {
const { config } = useConfig();
const { useRPCPacket, sendRPCPacket } = useWebsocketAPI();
const [recording, setRecording] = useState(false);
@@ -60,11 +62,11 @@ export function BVHButton(props: React.HTMLAttributes<HTMLButtonElement>) {
onClick={toggleBVH}
disabled={saving}
className={classNames(
props.className,
className,
'border',
recording ? 'border-status-critical' : 'border-transparent'
)}
></BigButton>
/>
</Localized>
);
}
+4 -4
View File
@@ -1,15 +1,15 @@
import { Localized } from '@fluent/react';
import { ClearMountingResetRequestT, RpcMessage } from 'solarxr-protocol';
import { useWebsocketAPI } from '@/hooks/websocket-api';
import { BigButton } from './commons/BigButton';
import { TrashIcon } from './commons/icon/TrashIcon';
import { Quaternion } from 'three';
import { QuaternionFromQuatT, similarQuaternions } from '@/maths/quaternion';
import { useMemo } from 'react';
import { useAtomValue } from 'jotai';
import { assignedTrackersAtom } from '@/store/app-store';
import { TrashIcon } from './commons/icon/TrashIcon';
import { BigButton } from './commons/BigButton';
const _q = new Quaternion();
const QUAT = new Quaternion();
export function ClearMountingButton() {
const { sendRPCPacket } = useWebsocketAPI();
@@ -21,7 +21,7 @@ export function ClearMountingButton() {
(d) =>
!similarQuaternions(
QuaternionFromQuatT(d?.tracker.info?.mountingResetOrientation),
_q
QUAT
)
),
[assignedTrackers]
+1 -1
View File
@@ -6,7 +6,7 @@ export function EmptyLayout({ children }: { children: ReactNode }) {
return (
<div className="empty-layout h-full">
<div style={{ gridArea: 't' }}>
<TopBar></TopBar>
<TopBar />
</div>
<div style={{ gridArea: 'c' }} className="mt-2 relative">
{children}
+21 -26
View File
@@ -26,34 +26,29 @@ export function ErrorConsentModal({
return (
<BaseModal isOpen={isOpen} onRequestClose={cancel} closeable={false}>
<div className="flex flex-col gap-3">
<>
<div className="flex flex-col items-center gap-3 fill-accent-background-20">
<div className="flex flex-col items-center gap-2 max-w-[512px]">
<Typography variant="main-title">
{l10n.getString('error_collection_modal-title')}
</Typography>
<Localized
id={'error_collection_modal-description_v2'}
elems={{
b: <b></b>,
h1: <span className="text-lg font-bold"></span>,
}}
>
<Typography
variant="standard"
whitespace="whitespace-pre-line"
/>
</Localized>
</div>
<div className="flex flex-col items-center gap-3 fill-accent-background-20">
<div className="flex flex-col items-center gap-2 max-w-[512px]">
<Typography variant="main-title">
{l10n.getString('error_collection_modal-title')}
</Typography>
<Localized
id={'error_collection_modal-description_v2'}
elems={{
b: <b />,
h1: <span className="text-lg font-bold" />,
}}
>
<Typography variant="standard" whitespace="whitespace-pre-line" />
</Localized>
</div>
</div>
<Button variant="primary" onClick={accept}>
{l10n.getString('error_collection_modal-confirm')}
</Button>
<Button variant="tertiary" onClick={cancel}>
{l10n.getString('error_collection_modal-cancel')}
</Button>
</>
<Button variant="primary" onClick={accept}>
{l10n.getString('error_collection_modal-confirm')}
</Button>
<Button variant="tertiary" onClick={cancel}>
{l10n.getString('error_collection_modal-cancel')}
</Button>
</div>
</BaseModal>
);
+3 -1
View File
@@ -9,7 +9,9 @@
grid-template:
't t t' var(--topbar-h)
's c w' calc(100% - var(--topbar-h))
/ var(--navbar-w) calc(100% - var(--navbar-w) - var(--widget-w)) var(--widget-w);
/ var(--navbar-w) calc(100% - var(--navbar-w) - var(--widget-w)) var(
--widget-w
);
}
@screen mobile {
+9 -7
View File
@@ -6,9 +6,9 @@ import {
RpcMessage,
SettingsRequestT,
} from 'solarxr-protocol';
import { useWebsocketAPI } from '@/hooks/websocket-api';
import { Navbar } from './Navbar';
import { TopBar } from './TopBar';
import { useWebsocketAPI } from '@/hooks/websocket-api';
import { WidgetsComponent } from './WidgetsComponent';
import './MainLayout.scss';
@@ -33,11 +33,11 @@ export function MainLayout({
function usePageChanged(callback: () => void) {
useEffect(() => {
callback();
}, [location.pathname]);
}, [window.location.pathname]);
}
usePageChanged(() => {
if (location.pathname.includes('body-proportions')) {
if (window.location.pathname.includes('body-proportions')) {
const tempSettings = new LegTweaksTmpChangeT();
tempSettings.skatingCorrection = false;
tempSettings.floorClip = false;
@@ -54,17 +54,19 @@ export function MainLayout({
sendRPCPacket(RpcMessage.LegTweaksTmpClear, resetSettings);
}
setProportionsLastPageOpen(location.pathname.includes('body-proportions'));
setProportionsLastPageOpen(
window.location.pathname.includes('body-proportions')
);
});
return (
<div className="">
<div className="main-layout w-full h-screen">
<div style={{ gridArea: 't' }}>
<TopBar></TopBar>
<TopBar />
</div>
<div style={{ gridArea: 's' }} className="overflow-y-auto">
<Navbar></Navbar>
<Navbar />
</div>
<div
style={{ gridArea: 'c' }}
@@ -81,7 +83,7 @@ export function MainLayout({
style={{ gridArea: 'w' }}
className="overflow-y-auto mr-2 my-2 rounded-xl bg-background-70 flex flex-col gap-2 p-2 widgets"
>
<WidgetsComponent></WidgetsComponent>
<WidgetsComponent />
</div>
)}
</div>
+10 -10
View File
@@ -2,14 +2,14 @@ import { useLocalization } from '@fluent/react';
import classnames from 'classnames';
import { ReactNode } from 'react';
import { NavLink, useMatch } from 'react-router-dom';
import { useBreakpoint } from '@/hooks/breakpoint';
import { useConfig } from '@/hooks/config';
import { CubeIcon } from './commons/icon/CubeIcon';
import { GearIcon } from './commons/icon/GearIcon';
import { HumanIcon } from './commons/icon/HumanIcon';
import { RulerIcon } from './commons/icon/RulerIcon';
import { SparkleIcon } from './commons/icon/SparkleIcon';
import { WrenchIcon } from './commons/icon/WrenchIcons';
import { useBreakpoint } from '@/hooks/breakpoint';
import { useConfig } from '@/hooks/config';
export function NavButton({
to,
@@ -70,13 +70,13 @@ export function MainLinks() {
return (
<>
<NavButton to="/" icon={<CubeIcon></CubeIcon>}>
<NavButton to="/" icon={<CubeIcon />}>
{l10n.getString('navbar-home')}
</NavButton>
<NavButton
to="/onboarding/trackers-assign"
state={{ alonePage: true }}
icon={<HumanIcon></HumanIcon>}
icon={<HumanIcon />}
>
{l10n.getString('navbar-trackers_assign')}
</NavButton>
@@ -84,7 +84,7 @@ export function MainLinks() {
to="/onboarding/mounting/choose"
match="/onboarding/mounting/*"
state={{ alonePage: true }}
icon={<WrenchIcon></WrenchIcon>}
icon={<WrenchIcon />}
>
{l10n.getString('navbar-mounting')}
</NavButton>
@@ -92,12 +92,12 @@ export function MainLinks() {
to="/onboarding/body-proportions/scaled"
match="/onboarding/body-proportions/*"
state={{ alonePage: true }}
icon={<RulerIcon></RulerIcon>}
icon={<RulerIcon />}
>
{l10n.getString('navbar-body_proportions')}
</NavButton>
{config?.showNavbarOnboarding && (
<NavButton to="/onboarding/home" icon={<SparkleIcon></SparkleIcon>}>
<NavButton to="/onboarding/home" icon={<SparkleIcon />}>
{l10n.getString('navbar-onboarding')}
</NavButton>
)}
@@ -111,18 +111,18 @@ export function Navbar() {
return isMobile ? (
<div className="flex flex-row justify-around px-2 pt-2 bg-background-80 gap-2">
<MainLinks></MainLinks>
<MainLinks />
</div>
) : (
<div className="flex flex-col h-full p-2 gap-2">
<div className="flex flex-col flex-grow gap-2">
<MainLinks></MainLinks>
<MainLinks />
</div>
<NavButton
to="/settings/trackers"
match="/settings/*"
state={{ scrollTo: 'steamvr' }}
icon={<GearIcon></GearIcon>}
icon={<GearIcon />}
>
{l10n.getString('navbar-settings')}
</NavButton>
+1
View File
@@ -1,4 +1,5 @@
import { Helmet } from 'react-helmet';
export function Preload() {
return (
<Helmet>
+2 -2
View File
@@ -69,7 +69,7 @@ export function SerialDetectionModal() {
{!showWifiForm && (
<>
<div className="flex flex-col items-center gap-3 fill-accent-background-20">
<USBIcon></USBIcon>
<USBIcon />
<div className="flex flex-col items-center gap-2">
<Typography variant="main-title">
{l10n.getString('serial_detection-new_device-p0')}
@@ -101,7 +101,7 @@ export function SerialDetectionModal() {
>
<div className="flex flex-col items-center gap-3">
<div className="fill-background-10">
<BulbIcon></BulbIcon>
<BulbIcon />
</div>
<Typography variant="main-title">
{l10n.getString('serial_detection-new_device-p0')}
+31 -37
View File
@@ -7,28 +7,16 @@ import {
TrackerStatus,
} from 'solarxr-protocol';
import { useWebsocketAPI } from '@/hooks/websocket-api';
import { CloseIcon } from './commons/icon/CloseIcon';
import { MaximiseIcon } from './commons/icon/MaximiseIcon';
import { MinimiseIcon } from './commons/icon/MinimiseIcon';
import { SlimeVRIcon } from './commons/icon/SimevrIcon';
import { ProgressBar } from './commons/ProgressBar';
import { Typography } from './commons/Typography';
import { DownloadIcon } from './commons/icon/DownloadIcon';
import { open } from '@tauri-apps/plugin-shell';
import { DOCS_SITE, GH_REPO, VersionContext } from '@/App';
import classNames from 'classnames';
import { QuestionIcon } from './commons/icon/QuestionIcon';
import { useBreakpoint, useIsTauri } from '@/hooks/breakpoint';
import { GearIcon } from './commons/icon/GearIcon';
import { invoke } from '@tauri-apps/api/core';
import { TrackersStillOnModal } from './TrackersStillOnModal';
import { useConfig } from '@/hooks/config';
import { listen, TauriEvent } from '@tauri-apps/api/event';
import { TrayOrExitModal } from './TrayOrExitModal';
import { error } from '@/utils/logging';
import { useDoubleTap } from 'use-double-tap';
import { isTrayAvailable } from '@/utils/tauri';
import { ErrorConsentModal } from './ErrorConsentModal';
import {
CloseRequestedEvent,
getCurrentWindow,
@@ -36,6 +24,18 @@ import {
} from '@tauri-apps/api/window';
import { useAtomValue } from 'jotai';
import { connectedIMUTrackersAtom } from '@/store/app-store';
import { ErrorConsentModal } from './ErrorConsentModal';
import { TrayOrExitModal } from './TrayOrExitModal';
import { TrackersStillOnModal } from './TrackersStillOnModal';
import { GearIcon } from './commons/icon/GearIcon';
import { QuestionIcon } from './commons/icon/QuestionIcon';
import { DownloadIcon } from './commons/icon/DownloadIcon';
import { Typography } from './commons/Typography';
import { ProgressBar } from './commons/ProgressBar';
import { SlimeVRIcon } from './commons/icon/SimevrIcon';
import { MinimiseIcon } from './commons/icon/MinimiseIcon';
import { MaximiseIcon } from './commons/icon/MaximiseIcon';
import { CloseIcon } from './commons/icon/CloseIcon';
export function VersionTag() {
return (
@@ -155,7 +155,7 @@ export function TopBar({
return (
<>
<div className="flex gap-0 flex-col">
<div className="h-[3px]"></div>
<div className="h-[3px]" />
<div data-tauri-drag-region className="flex gap-2 h-[38px] z-50">
<div
className="flex px-2 py-2 justify-around z-50"
@@ -168,7 +168,7 @@ export function TopBar({
className="flex justify-around flex-col select-all"
data-tauri-drag-region
>
<SlimeVRIcon></SlimeVRIcon>
<SlimeVRIcon />
</NavLink>
)}
{(isTauri || !isMobile) && !config?.decorations && (
@@ -181,7 +181,7 @@ export function TopBar({
)}
{(!(isMobile && !config?.decorations) || showVersionMobile) && (
<>
<VersionTag></VersionTag>
<VersionTag />
{doesMatchSettings && (
<div
className={classNames(
@@ -206,7 +206,7 @@ export function TopBar({
open(url).catch(() => window.open(url, '_blank'));
}}
>
<DownloadIcon></DownloadIcon>
<DownloadIcon />
</div>
)}
</div>
@@ -216,20 +216,14 @@ export function TopBar({
data-tauri-drag-region
>
{!isMobile && (
<>
<div
className="flex max-w-xl h-full items-center w-full"
data-tauri-drag-region
>
{progress !== undefined && (
<ProgressBar
progress={progress}
height={3}
parts={3}
></ProgressBar>
)}
</div>
</>
<div
className="flex max-w-xl h-full items-center w-full"
data-tauri-drag-region
>
{progress !== undefined && (
<ProgressBar progress={progress} height={3} parts={3} />
)}
</div>
)}
{!isTauri && !showVersionMobile && !config?.decorations && (
@@ -256,7 +250,7 @@ export function TopBar({
data-tauri-drag-region
state={{ scrollTo: 'steamvr' }}
>
<GearIcon></GearIcon>
<GearIcon />
</NavLink>
{!isMobile && (
@@ -269,7 +263,7 @@ export function TopBar({
open(DOCS_SITE).catch(() => window.open(DOCS_SITE, '_blank'))
}
>
<QuestionIcon></QuestionIcon>
<QuestionIcon />
</div>
)}
@@ -279,19 +273,19 @@ export function TopBar({
className="flex items-center justify-center hover:bg-background-60 rounded-full w-7 h-7"
onClick={() => getCurrentWindow().minimize()}
>
<MinimiseIcon></MinimiseIcon>
<MinimiseIcon />
</div>
<div
className="flex items-center justify-center hover:bg-background-60 rounded-full w-7 h-7"
onClick={() => getCurrentWindow().toggleMaximize()}
>
<MaximiseIcon></MaximiseIcon>
<MaximiseIcon />
</div>
<div
className="flex items-center justify-center hover:bg-background-60 rounded-full w-7 h-7"
onClick={() => tryCloseApp()}
>
<CloseIcon></CloseIcon>
<CloseIcon />
</div>
</>
)}
@@ -299,7 +293,7 @@ export function TopBar({
</div>
{isMobile && progress !== undefined && (
<div className="flex gap-2 px-2 h-6 mb-2 justify-center flex-col border-b border-accent-background-30">
<ProgressBar progress={progress} height={3} parts={3}></ProgressBar>
<ProgressBar progress={progress} height={3} parts={3} />
</div>
)}
</div>
@@ -333,7 +327,7 @@ export function TopBar({
setConnectedTrackerWarning(false);
getCurrentWindow().requestUserAttention(null);
}}
></TrackersStillOnModal>
/>
<ErrorConsentModal
isOpen={config?.errorTracking === null}
accept={() => setConfig({ errorTracking: true })}
+15 -17
View File
@@ -26,25 +26,23 @@ export function TrackersStillOnModal({
return (
<BaseModal isOpen={isOpen} onRequestClose={cancel} important>
<div className="flex flex-col gap-3">
<>
<div className="flex flex-col items-center gap-3 fill-accent-background-20">
<div className="flex flex-col items-center gap-2">
<Typography variant="main-title">
{l10n.getString('trackers_still_on-modal-title')}
</Typography>
<Typography variant="standard">
{l10n.getString('trackers_still_on-modal-description')}
</Typography>
</div>
<div className="flex flex-col items-center gap-3 fill-accent-background-20">
<div className="flex flex-col items-center gap-2">
<Typography variant="main-title">
{l10n.getString('trackers_still_on-modal-title')}
</Typography>
<Typography variant="standard">
{l10n.getString('trackers_still_on-modal-description')}
</Typography>
</div>
</div>
<Button variant="primary" onClick={accept}>
{l10n.getString('trackers_still_on-modal-confirm')}
</Button>
<Button variant="tertiary" onClick={cancel}>
{l10n.getString('trackers_still_on-modal-cancel')}
</Button>
</>
<Button variant="primary" onClick={accept}>
{l10n.getString('trackers_still_on-modal-confirm')}
</Button>
<Button variant="tertiary" onClick={cancel}>
{l10n.getString('trackers_still_on-modal-cancel')}
</Button>
</div>
</BaseModal>
);
+6 -6
View File
@@ -7,14 +7,14 @@ import {
TrackingPauseStateRequestT,
} from 'solarxr-protocol';
import { useWebsocketAPI } from '@/hooks/websocket-api';
import classNames from 'classnames';
import { BigButton } from './commons/BigButton';
import { PlayIcon } from './commons/icon/PlayIcon';
import { PauseIcon } from './commons/icon/PauseIcon';
import classNames from 'classnames';
export function TrackingPauseButton(
props: React.HTMLAttributes<HTMLButtonElement>
) {
export function TrackingPauseButton({
className,
}: React.HTMLAttributes<HTMLButtonElement>) {
const { useRPCPacket, sendRPCPacket } = useWebsocketAPI();
const [trackingPause, setTrackingPause] = useState(false);
@@ -44,8 +44,8 @@ export function TrackingPauseButton(
trackingPause ? <PlayIcon width={20} /> : <PauseIcon width={20} />
}
onClick={toggleTracking}
className={classNames(props.className, 'min-h-24')}
></BigButton>
className={classNames(className, 'min-h-24')}
/>
</Localized>
);
}
+3 -3
View File
@@ -1,8 +1,8 @@
import { useLocalization } from '@fluent/react';
import { useForm } from 'react-hook-form';
import { BaseModal } from './commons/BaseModal';
import { Button } from './commons/Button';
import { Typography } from './commons/Typography';
import { useForm } from 'react-hook-form';
import { Radio } from './commons/Radio';
interface TrayOrExitForm {
@@ -57,13 +57,13 @@ export function TrayOrExitModal({
name="exitType"
label={l10n.getString('tray_or_exit_modal-radio-exit')}
value="0"
></Radio>
/>
<Radio
control={control}
name="exitType"
label={l10n.getString('tray_or_exit_modal-radio-tray')}
value="1"
></Radio>
/>
</div>
<Button type="submit" variant="primary">
+5 -5
View File
@@ -1,7 +1,4 @@
import { useState } from 'react';
import { BaseModal } from './commons/BaseModal';
import { Typography } from './commons/Typography';
import { Button } from './commons/Button';
import { Localized, useLocalization } from '@fluent/react';
import { useWebsocketAPI } from '@/hooks/websocket-api';
import { useLocation } from 'react-router-dom';
@@ -13,6 +10,9 @@ import {
import { useDebouncedEffect } from '@/hooks/timeout';
import { useAtom } from 'jotai';
import { ignoredTrackersAtom } from '@/store/app-store';
import { Button } from './commons/Button';
import { Typography } from './commons/Typography';
import { BaseModal } from './commons/BaseModal';
export function UnknownDeviceModal() {
const { l10n } = useLocalization();
@@ -63,7 +63,7 @@ export function UnknownDeviceModal() {
</Typography>
<Localized
id="unknown_device-modal-description"
elems={{ b: <b></b> }}
elems={{ b: <b /> }}
vars={{ deviceId: currentTracker ?? 'ERROR' }}
>
<Typography
@@ -93,7 +93,7 @@ export function UnknownDeviceModal() {
variant="tertiary"
onClick={() => {
setIgnoredTracker((state) => {
if (!currentTracker) throw 'should have a tracker';
if (!currentTracker) throw Error('should have a tracker');
state.add(currentTracker);
return state;
});
+29 -31
View File
@@ -1,12 +1,12 @@
import { useLocalization } from '@fluent/react';
import { useContext, useState } from 'react';
import { BaseModal } from './commons/BaseModal';
import { Button } from './commons/Button';
import { Typography } from './commons/Typography';
import { open } from '@tauri-apps/plugin-shell';
import semver from 'semver';
import { GH_REPO, VersionContext } from '@/App';
import { error } from '@/utils/logging';
import { Typography } from './commons/Typography';
import { Button } from './commons/Button';
import { BaseModal } from './commons/BaseModal';
export function VersionUpdateModal() {
const { l10n } = useLocalization();
@@ -34,36 +34,34 @@ export function VersionUpdateModal() {
onRequestClose={closeModal}
>
<div className="flex flex-col gap-3">
<>
<div className="flex flex-col items-center gap-3 fill-accent-background-20">
<div className="flex flex-col items-center gap-2">
<Typography variant="main-title">
{l10n.getString('version_update-title', {
version: newVersion,
})}
</Typography>
<Typography variant="standard">
{l10n.getString('version_update-description')}
</Typography>
</div>
<div className="flex flex-col items-center gap-3 fill-accent-background-20">
<div className="flex flex-col items-center gap-2">
<Typography variant="main-title">
{l10n.getString('version_update-title', {
version: newVersion,
})}
</Typography>
<Typography variant="standard">
{l10n.getString('version_update-description')}
</Typography>
</div>
</div>
<Button
variant="primary"
onClick={async () => {
const url = document.body.classList.contains('windows')
? 'https://slimevr.dev/download'
: `https://github.com/${GH_REPO}/releases/latest`;
await open(url).catch(() => window.open(url, '_blank'));
closeModal();
}}
>
{l10n.getString('version_update-update')}
</Button>
<Button variant="tertiary" onClick={closeModal}>
{l10n.getString('version_update-close')}
</Button>
</>
<Button
variant="primary"
onClick={async () => {
const url = document.body.classList.contains('windows')
? 'https://slimevr.dev/download'
: `https://github.com/${GH_REPO}/releases/latest`;
await open(url).catch(() => window.open(url, '_blank'));
closeModal();
}}
>
{l10n.getString('version_update-update')}
</Button>
<Button variant="tertiary" onClick={closeModal}>
{l10n.getString('version_update-close')}
</Button>
</div>
</BaseModal>
);
+26 -16
View File
@@ -1,18 +1,18 @@
import { Localized, useLocalization } from '@fluent/react';
import { useConfig } from '@/hooks/config';
import { ResetType, StatusData } from 'solarxr-protocol';
import { useMemo } from 'react';
import { parseStatusToLocale, useStatusContext } from '@/hooks/status-system';
import { useAtomValue } from 'jotai';
import { flatTrackersAtom } from '@/store/app-store';
import { BVHButton } from './BVHButton';
import { TrackingPauseButton } from './TrackingPauseButton';
import { ResetButton } from './home/ResetButton';
import { OverlayWidget } from './widgets/OverlayWidget';
import { TipBox } from './commons/TipBox';
import { DeveloperModeWidget } from './widgets/DeveloperModeWidget';
import { useConfig } from '@/hooks/config';
import { ResetType, StatusData } from 'solarxr-protocol';
import { useMemo } from 'react';
import { parseStatusToLocale, useStatusContext } from '@/hooks/status-system';
import { ClearMountingButton } from './ClearMountingButton';
import { ToggleableSkeletonVisualizerWidget } from './widgets/SkeletonVisualizerWidget';
import { useAtomValue } from 'jotai';
import { flatTrackersAtom } from '@/store/app-store';
import { A } from './commons/A';
function UnprioritizedStatuses() {
@@ -33,7 +33,7 @@ function UnprioritizedStatuses() {
key={status.id}
elems={{
PublicFixLink: (
<A href="https://docs.slimevr.dev/common-issues.html#network-profile-is-currently-set-to-public"></A>
<A href="https://docs.slimevr.dev/common-issues.html#network-profile-is-currently-set-to-public" />
),
}}
>
@@ -52,25 +52,35 @@ export function WidgetsComponent() {
return (
<>
<div className="grid grid-cols-2 gap-2 w-full [&>*:nth-child(odd):last-of-type]:col-span-full">
<ResetButton type={ResetType.Yaw} size="big"></ResetButton>
<ResetButton type={ResetType.Full} size="big"></ResetButton>
<ResetButton type={ResetType.Mounting} size="big"></ResetButton>
<ClearMountingButton></ClearMountingButton>
<ResetButton type={ResetType.Yaw} size="big" />
<ResetButton type={ResetType.Full} size="big" />
<ResetButton type={ResetType.Mounting} size="big" />
<ResetButton
type={ResetType.Mounting}
size="big"
bodyPartsToReset="feet"
/>
<ResetButton
type={ResetType.Mounting}
size="big"
bodyPartsToReset="fingers"
/>
<ClearMountingButton />
{(typeof __ANDROID__ === 'undefined' || !__ANDROID__?.isThere()) && (
<BVHButton></BVHButton>
<BVHButton />
)}
<TrackingPauseButton></TrackingPauseButton>
<TrackingPauseButton />
</div>
<div className="w-full">
<OverlayWidget></OverlayWidget>
<OverlayWidget />
</div>
<div className="mb-2">
<ToggleableSkeletonVisualizerWidget height={400} />
</div>
<UnprioritizedStatuses></UnprioritizedStatuses>
<UnprioritizedStatuses />
{config?.debug && (
<div className="w-full">
<DeveloperModeWidget></DeveloperModeWidget>
<DeveloperModeWidget />
</div>
)}
</>
+1 -1
View File
@@ -4,7 +4,7 @@ import { ReactNode } from 'react';
export function A({ href, children }: { href?: string; children?: ReactNode }) {
return (
<a
href="javascript:void(0)"
href={'javascript:'}
onClick={() =>
href && open(href).catch(() => window.open(href, '_blank'))
}
+2 -2
View File
@@ -36,13 +36,13 @@ export function ArrowLink({
<NavLink to={to} state={state} className={classes}>
{direction === 'left' && (
<div className="flex flex-col justify-center">
<ArrowLeftIcon></ArrowLeftIcon>
<ArrowLeftIcon />
</div>
)}
{children}
{direction === 'right' && (
<div className="flex flex-col justify-center">
<ArrowRightIcon></ArrowRightIcon>
<ArrowRightIcon />
</div>
)}
</NavLink>
+13 -16
View File
@@ -8,9 +8,9 @@ import {
useState,
} from 'react';
import { BodyPart, TrackerDataT } from 'solarxr-protocol';
import { useTracker } from '@/hooks/tracker';
import { PersonFrontIcon } from './PersonFrontIcon';
import { uniqueNumberFromTracker, useTracker } from '@/hooks/tracker';
import { FlatDeviceTracker } from '@/store/app-store';
import { PersonFrontIcon } from './PersonFrontIcon';
interface SlotDot {
id: string;
@@ -45,7 +45,7 @@ function Tracker({
updateVelocity(velocity);
}, [velocity]);
return <></>;
return null;
}
function Dot({
@@ -94,11 +94,11 @@ function Dot({
height: dotSize,
outlineWidth: globalVelocity * 2 + 2,
}}
></div>
{trackers?.map(({ tracker }, index) => (
/>
{trackers?.map(({ tracker }) => (
<Tracker
tracker={tracker}
key={index}
key={uniqueNumberFromTracker(tracker)}
updateVelocity={(vel) => updateVelocity(vel)}
/>
))}
@@ -126,14 +126,11 @@ export function BodyDisplay({
const personRef = useRef<HTMLDivElement | null>(null);
const [slotsButtonsPos, setSlotsButtonPos] = useState<SlotDot[]>([]);
const getSlotsPos = () => {
return (
(personRef.current && [
...(personRef.current.querySelectorAll('.body-part-circle') as any),
]) ||
[]
);
};
const getSlotsPos = () =>
(personRef.current && [
...(personRef.current.querySelectorAll('.body-part-circle') as any),
]) ||
[];
const getOffset = (el: HTMLDivElement, offset = { left: 0, top: 0 }) => {
const rect = el.getBoundingClientRect();
@@ -166,7 +163,7 @@ export function BodyDisplay({
const trackerPartGrouped = useMemo(
() =>
trackers.reduce<{ [key: number]: FlatDeviceTracker[] }>((curr, td) => {
trackers.reduce<Record<number, FlatDeviceTracker[]>>((curr, td) => {
if (!td) return curr;
const key = td.tracker.info?.bodyPart || BodyPart.NONE;
@@ -187,7 +184,7 @@ export function BodyDisplay({
variant === 'tracker-select' && 'mx-10'
)}
>
<PersonFrontIcon width={width}></PersonFrontIcon>
<PersonFrontIcon width={width} />
{slotsButtonsPos.map((dotData) => (
<Dot
{...dotData}
+10 -13
View File
@@ -1,8 +1,8 @@
import classNames from 'classnames';
import { ReactNode, useEffect, useRef, useState } from 'react';
import { BodyPart } from 'solarxr-protocol';
import { PersonFrontIcon } from './PersonFrontIcon';
import { useBreakpoint } from '@/hooks/breakpoint';
import { PersonFrontIcon } from './PersonFrontIcon';
export function BodyInteractions({
leftControls,
@@ -52,14 +52,11 @@ export function BodyInteractions({
}[]
>([]);
const getSlotsPos = () => {
return (
(personRef.current && [
...(personRef.current.querySelectorAll('.body-part-circle') as any),
]) ||
[]
);
};
const getSlotsPos = () =>
(personRef.current && [
...(personRef.current.querySelectorAll('.body-part-circle') as any),
]) ||
[];
const getControlsPos = () => {
const pos = (container: HTMLDivElement) =>
@@ -198,7 +195,7 @@ export function BodyInteractions({
className="absolute w-full h-full top-0 z-10"
width="100%"
height="100%"
></canvas>
/>
<div className="flex">
<div ref={leftContainerRef} className="z-10">
{leftControls}
@@ -210,7 +207,7 @@ export function BodyInteractions({
variant === 'tracker-select' && 'mobile:mx-0 xs:mx-10'
)}
>
<PersonFrontIcon width={width} mirror={mirror}></PersonFrontIcon>
<PersonFrontIcon width={width} mirror={mirror} />
{slotsButtonsPos.map(
({ top, left, height, width, id, hidden, buttonOffset }) => (
<div
@@ -234,7 +231,7 @@ export function BodyInteractions({
height: dotsSize,
animationDuration: '1.5s',
}}
></div>
/>
)}
<div
className={classNames(
@@ -249,7 +246,7 @@ export function BodyInteractions({
width: dotsSize,
height: dotsSize,
}}
></div>
/>
</div>
</div>
)
+55 -107
View File
@@ -28,155 +28,103 @@ export const mapPart: Record<
currentLocales: string[];
}) => JSX.Element
> = {
[BodyPart.UPPER_CHEST]: ({ width }) => (
<UpperChestIcon width={width}></UpperChestIcon>
),
[BodyPart.CHEST]: ({ width }) => <ChestIcon width={width}></ChestIcon>,
[BodyPart.HEAD]: ({ width }) => <HeadsetIcon width={width}></HeadsetIcon>,
[BodyPart.HIP]: ({ width }) => <HipIcon width={width}></HipIcon>,
[BodyPart.LEFT_HIP]: ({ width }) => <HipIcon width={width}></HipIcon>, // Unused
[BodyPart.RIGHT_HIP]: ({ width }) => <HipIcon width={width}></HipIcon>, // Unused
[BodyPart.UPPER_CHEST]: ({ width }) => <UpperChestIcon width={width} />,
[BodyPart.CHEST]: ({ width }) => <ChestIcon width={width} />,
[BodyPart.HEAD]: ({ width }) => <HeadsetIcon width={width} />,
[BodyPart.HIP]: ({ width }) => <HipIcon width={width} />,
[BodyPart.LEFT_HIP]: ({ width }) => <HipIcon width={width} />, // Unused
[BodyPart.RIGHT_HIP]: ({ width }) => <HipIcon width={width} />, // Unused
[BodyPart.LEFT_FOOT]: ({ width, currentLocales }) =>
currentLocales.includes('en-x-owo') ? (
<PawIcon></PawIcon>
<PawIcon />
) : (
<FootIcon width={width}></FootIcon>
<FootIcon width={width} />
),
[BodyPart.LEFT_HAND]: ({ width }) => (
<ControllerIcon width={width}></ControllerIcon>
),
[BodyPart.LEFT_LOWER_ARM]: ({ width }) => (
<LowerArmIcon width={width}></LowerArmIcon>
),
[BodyPart.LEFT_LOWER_LEG]: ({ width }) => (
<AnkleIcon width={width}></AnkleIcon>
),
[BodyPart.LEFT_SHOULDER]: ({ width }) => (
<ShoulderIcon width={width}></ShoulderIcon>
),
[BodyPart.LEFT_UPPER_ARM]: ({ width }) => (
<UpperArmIcon width={width}></UpperArmIcon>
),
[BodyPart.LEFT_UPPER_LEG]: ({ width }) => (
<UpperLegIcon width={width}></UpperLegIcon>
),
[BodyPart.NECK]: ({ width }) => <NeckIcon width={width}></NeckIcon>,
[BodyPart.NONE]: ({ width }) => <SlimeVRIcon width={width}></SlimeVRIcon>,
[BodyPart.LEFT_HAND]: ({ width }) => <ControllerIcon width={width} />,
[BodyPart.LEFT_LOWER_ARM]: ({ width }) => <LowerArmIcon width={width} />,
[BodyPart.LEFT_LOWER_LEG]: ({ width }) => <AnkleIcon width={width} />,
[BodyPart.LEFT_SHOULDER]: ({ width }) => <ShoulderIcon width={width} />,
[BodyPart.LEFT_UPPER_ARM]: ({ width }) => <UpperArmIcon width={width} />,
[BodyPart.LEFT_UPPER_LEG]: ({ width }) => <UpperLegIcon width={width} />,
[BodyPart.NECK]: ({ width }) => <NeckIcon width={width} />,
[BodyPart.NONE]: ({ width }) => <SlimeVRIcon width={width} />,
[BodyPart.RIGHT_FOOT]: ({ width, currentLocales }) =>
currentLocales.includes('en-x-owo') ? (
<PawIcon></PawIcon>
<PawIcon />
) : (
<FootIcon width={width} flipped></FootIcon>
<FootIcon width={width} flipped />
),
[BodyPart.RIGHT_HAND]: ({ width }) => (
<ControllerIcon width={width} flipped></ControllerIcon>
<ControllerIcon width={width} flipped />
),
[BodyPart.RIGHT_LOWER_ARM]: ({ width }) => (
<LowerArmIcon width={width} flipped></LowerArmIcon>
<LowerArmIcon width={width} flipped />
),
[BodyPart.RIGHT_LOWER_LEG]: ({ width }) => (
<AnkleIcon width={width} flipped></AnkleIcon>
),
[BodyPart.RIGHT_SHOULDER]: ({ width }) => (
<ShoulderIcon width={width}></ShoulderIcon>
<AnkleIcon width={width} flipped />
),
[BodyPart.RIGHT_SHOULDER]: ({ width }) => <ShoulderIcon width={width} />,
[BodyPart.RIGHT_UPPER_ARM]: ({ width }) => (
<UpperArmIcon width={width} flipped></UpperArmIcon>
<UpperArmIcon width={width} flipped />
),
[BodyPart.RIGHT_UPPER_LEG]: ({ width }) => (
<UpperLegIcon width={width} flipped></UpperLegIcon>
<UpperLegIcon width={width} flipped />
),
[BodyPart.WAIST]: ({ width }) => <WaistIcon width={width}></WaistIcon>,
[BodyPart.WAIST]: ({ width }) => <WaistIcon width={width} />,
[BodyPart.LEFT_THUMB_METACARPAL]: ({ width }) => (
<FingersIcon width={width}></FingersIcon>
),
[BodyPart.LEFT_THUMB_PROXIMAL]: ({ width }) => (
<FingersIcon width={width}></FingersIcon>
),
[BodyPart.LEFT_THUMB_DISTAL]: ({ width }) => (
<FingersIcon width={width}></FingersIcon>
),
[BodyPart.LEFT_INDEX_PROXIMAL]: ({ width }) => (
<FingersIcon width={width}></FingersIcon>
<FingersIcon width={width} />
),
[BodyPart.LEFT_THUMB_PROXIMAL]: ({ width }) => <FingersIcon width={width} />,
[BodyPart.LEFT_THUMB_DISTAL]: ({ width }) => <FingersIcon width={width} />,
[BodyPart.LEFT_INDEX_PROXIMAL]: ({ width }) => <FingersIcon width={width} />,
[BodyPart.LEFT_INDEX_INTERMEDIATE]: ({ width }) => (
<FingersIcon width={width}></FingersIcon>
),
[BodyPart.LEFT_INDEX_DISTAL]: ({ width }) => (
<FingersIcon width={width}></FingersIcon>
),
[BodyPart.LEFT_MIDDLE_PROXIMAL]: ({ width }) => (
<FingersIcon width={width}></FingersIcon>
<FingersIcon width={width} />
),
[BodyPart.LEFT_INDEX_DISTAL]: ({ width }) => <FingersIcon width={width} />,
[BodyPart.LEFT_MIDDLE_PROXIMAL]: ({ width }) => <FingersIcon width={width} />,
[BodyPart.LEFT_MIDDLE_INTERMEDIATE]: ({ width }) => (
<FingersIcon width={width}></FingersIcon>
),
[BodyPart.LEFT_MIDDLE_DISTAL]: ({ width }) => (
<FingersIcon width={width}></FingersIcon>
),
[BodyPart.LEFT_RING_PROXIMAL]: ({ width }) => (
<FingersIcon width={width}></FingersIcon>
<FingersIcon width={width} />
),
[BodyPart.LEFT_MIDDLE_DISTAL]: ({ width }) => <FingersIcon width={width} />,
[BodyPart.LEFT_RING_PROXIMAL]: ({ width }) => <FingersIcon width={width} />,
[BodyPart.LEFT_RING_INTERMEDIATE]: ({ width }) => (
<FingersIcon width={width}></FingersIcon>
),
[BodyPart.LEFT_RING_DISTAL]: ({ width }) => (
<FingersIcon width={width}></FingersIcon>
),
[BodyPart.LEFT_LITTLE_PROXIMAL]: ({ width }) => (
<FingersIcon width={width}></FingersIcon>
<FingersIcon width={width} />
),
[BodyPart.LEFT_RING_DISTAL]: ({ width }) => <FingersIcon width={width} />,
[BodyPart.LEFT_LITTLE_PROXIMAL]: ({ width }) => <FingersIcon width={width} />,
[BodyPart.LEFT_LITTLE_INTERMEDIATE]: ({ width }) => (
<FingersIcon width={width}></FingersIcon>
),
[BodyPart.LEFT_LITTLE_DISTAL]: ({ width }) => (
<FingersIcon width={width}></FingersIcon>
<FingersIcon width={width} />
),
[BodyPart.LEFT_LITTLE_DISTAL]: ({ width }) => <FingersIcon width={width} />,
[BodyPart.RIGHT_THUMB_METACARPAL]: ({ width }) => (
<FingersIcon width={width}></FingersIcon>
),
[BodyPart.RIGHT_THUMB_PROXIMAL]: ({ width }) => (
<FingersIcon width={width}></FingersIcon>
),
[BodyPart.RIGHT_THUMB_DISTAL]: ({ width }) => (
<FingersIcon width={width}></FingersIcon>
),
[BodyPart.RIGHT_INDEX_PROXIMAL]: ({ width }) => (
<FingersIcon width={width}></FingersIcon>
<FingersIcon width={width} />
),
[BodyPart.RIGHT_THUMB_PROXIMAL]: ({ width }) => <FingersIcon width={width} />,
[BodyPart.RIGHT_THUMB_DISTAL]: ({ width }) => <FingersIcon width={width} />,
[BodyPart.RIGHT_INDEX_PROXIMAL]: ({ width }) => <FingersIcon width={width} />,
[BodyPart.RIGHT_INDEX_INTERMEDIATE]: ({ width }) => (
<FingersIcon width={width}></FingersIcon>
),
[BodyPart.RIGHT_INDEX_DISTAL]: ({ width }) => (
<FingersIcon width={width}></FingersIcon>
<FingersIcon width={width} />
),
[BodyPart.RIGHT_INDEX_DISTAL]: ({ width }) => <FingersIcon width={width} />,
[BodyPart.RIGHT_MIDDLE_PROXIMAL]: ({ width }) => (
<FingersIcon width={width}></FingersIcon>
<FingersIcon width={width} />
),
[BodyPart.RIGHT_MIDDLE_INTERMEDIATE]: ({ width }) => (
<FingersIcon width={width}></FingersIcon>
),
[BodyPart.RIGHT_MIDDLE_DISTAL]: ({ width }) => (
<FingersIcon width={width}></FingersIcon>
),
[BodyPart.RIGHT_RING_PROXIMAL]: ({ width }) => (
<FingersIcon width={width}></FingersIcon>
<FingersIcon width={width} />
),
[BodyPart.RIGHT_MIDDLE_DISTAL]: ({ width }) => <FingersIcon width={width} />,
[BodyPart.RIGHT_RING_PROXIMAL]: ({ width }) => <FingersIcon width={width} />,
[BodyPart.RIGHT_RING_INTERMEDIATE]: ({ width }) => (
<FingersIcon width={width}></FingersIcon>
),
[BodyPart.RIGHT_RING_DISTAL]: ({ width }) => (
<FingersIcon width={width}></FingersIcon>
<FingersIcon width={width} />
),
[BodyPart.RIGHT_RING_DISTAL]: ({ width }) => <FingersIcon width={width} />,
[BodyPart.RIGHT_LITTLE_PROXIMAL]: ({ width }) => (
<FingersIcon width={width}></FingersIcon>
<FingersIcon width={width} />
),
[BodyPart.RIGHT_LITTLE_INTERMEDIATE]: ({ width }) => (
<FingersIcon width={width}></FingersIcon>
),
[BodyPart.RIGHT_LITTLE_DISTAL]: ({ width }) => (
<FingersIcon width={width}></FingersIcon>
<FingersIcon width={width} />
),
[BodyPart.RIGHT_LITTLE_DISTAL]: ({ width }) => <FingersIcon width={width} />,
};
export function BodyPartIcon({
+1 -1
View File
@@ -29,7 +29,7 @@ function ButtonContent({
</div>
{loading && (
<div className="absolute top-0 left-0 w-full h-full flex justify-center items-center fill-background-10">
<LoaderIcon slimeState={SlimeState.JUMPY}></LoaderIcon>
<LoaderIcon slimeState={SlimeState.JUMPY} />
</div>
)}
</>
+1 -1
View File
@@ -100,7 +100,7 @@ export function CheckBox({
'right-0': value && !loading,
'bg-background-30': disabled,
})}
></div>
/>
</div>
)}
{label}
+6 -4
View File
@@ -68,7 +68,7 @@ export function DropdownItems({
<div
className="z-[999] fixed top-0 w-full h-full"
onClick={onBackdropClick}
></div>
/>
<div
ref={ref}
className={classNames(
@@ -80,7 +80,7 @@ export function DropdownItems({
itemBounds?.height == 0 && 'opacity-0' // Avoid flicker while the component find its position
)}
style={{
maxHeight: maxHeight,
maxHeight,
left:
alignment === 'left'
? dropdownBounds.left
@@ -117,6 +117,7 @@ export function DropdownItems({
onSelectItem(item);
}}
key={item.value}
role="button"
tabIndex={0}
data-checked={item.value === value}
>
@@ -194,6 +195,7 @@ export function Dropdown({
)}
onClick={() => setOpen((open) => !open)}
onKeyDown={(ev) => a11yClick(ev) && setOpen((open) => !open)}
role="button"
tabIndex={0}
>
<div className="flex-grow text-standard first:pointer-events-none">
@@ -208,7 +210,7 @@ export function Dropdown({
direction == 'down' && 'rotate-0'
)}
>
<ArrowDownIcon size={16}></ArrowDownIcon>
<ArrowDownIcon size={16} />
</div>
</div>
{isOpen &&
@@ -230,7 +232,7 @@ export function Dropdown({
onBackdropClick={() => {
setOpen(false);
}}
></DropdownItems>,
/>,
document.body
)}
</>
+82 -80
View File
@@ -19,13 +19,13 @@ interface InputProps {
name: string;
}
export const FileInputContentBlank = ({
export function FileInputContentBlank({
isDragging,
label,
}: {
isDragging: boolean;
label: string;
}) => {
}) {
return (
<div
className={classNames(
@@ -41,7 +41,7 @@ export const FileInputContentBlank = ({
<Localized
id={label}
elems={{
u: <span className="underline text-background-20"></span>,
u: <span className="underline text-background-20" />,
}}
>
<Typography>
@@ -53,15 +53,15 @@ export const FileInputContentBlank = ({
</span>
</div>
);
};
}
export const FileInputContentFile = ({
export function FileInputContentFile({
importedFileName,
onClearPicker,
}: {
importedFileName: string;
onClearPicker: () => any;
}) => {
}) {
return (
<div
className={classNames(
@@ -75,7 +75,7 @@ export const FileInputContentFile = ({
<FileIcon />
<span>{importedFileName}</span>
</div>
<span className="flex-grow"></span>
<span className="flex-grow" />
<a
href="#"
className="h-12 w-12 hover:bg-accent-background-20 cursor-pointer"
@@ -92,7 +92,7 @@ export const FileInputContentFile = ({
</div>
</div>
);
};
}
export const FileInputInside = forwardRef<
HTMLInputElement,
@@ -107,83 +107,85 @@ export const FileInputInside = forwardRef<
name: string;
importedFileName: string | null;
}
>(function AppInput(
{
label = 'tips-file_select',
name,
onChange,
accept,
capture,
multiple = false,
importedFileName,
},
ref
) {
const innerRef = useRef<HTMLInputElement>(null);
>(
(
{
label = 'tips-file_select',
name,
onChange,
accept,
capture,
multiple = false,
importedFileName,
},
ref
) => {
const innerRef = useRef<HTMLInputElement>(null);
useImperativeHandle(ref, () => innerRef.current!);
useImperativeHandle(ref, () => innerRef.current!);
const acceptList = useMemo(() => accept.split(/, ?/), [accept]);
const [isDragging, setDragging] = useState(false);
const acceptList = useMemo(() => accept.split(/, ?/), [accept]);
const [isDragging, setDragging] = useState(false);
const isFileImported = importedFileName !== null && !isDragging;
const isFileImported = importedFileName !== null && !isDragging;
const onClearPicker = () => {
onChange([]);
innerRef.current!.value = '';
};
const onClearPicker = () => {
onChange([]);
innerRef.current!.value = '';
};
return (
<label
onDragOver={(ev) => ev.preventDefault()}
onDrop={(ev) => {
ev.preventDefault();
setDragging(false);
return (
<label
onDragOver={(ev) => ev.preventDefault()}
onDrop={(ev) => {
ev.preventDefault();
setDragging(false);
if (
ev.dataTransfer.files.length &&
// If MIME type is any of the accept list,
// or if file extension is anything on the acceptList
(acceptList.includes(ev.dataTransfer.files[0].type) ||
acceptList.some((ext) =>
ev.dataTransfer.files[0].name.endsWith(ext)
))
) {
onChange(ev.dataTransfer.files);
}
}}
onDragEnter={(ev) => {
ev.preventDefault();
setDragging(true);
}}
onDragLeave={(ev) => {
ev.preventDefault();
setDragging(false);
}}
>
{isFileImported
? FileInputContentFile({ importedFileName, onClearPicker })
: FileInputContentBlank({ isDragging, label })}
<input
type="file"
className="hidden"
onChange={(ev) => {
if (ev.target.files?.length) {
onChange(ev.target.files);
if (
ev.dataTransfer.files.length &&
// If MIME type is any of the accept list,
// or if file extension is anything on the acceptList
(acceptList.includes(ev.dataTransfer.files[0].type) ||
acceptList.some((ext) =>
ev.dataTransfer.files[0].name.endsWith(ext)
))
) {
onChange(ev.dataTransfer.files);
}
}}
name={name}
ref={innerRef}
accept={accept}
multiple={multiple}
capture={capture}
></input>
</label>
);
});
onDragEnter={(ev) => {
ev.preventDefault();
setDragging(true);
}}
onDragLeave={(ev) => {
ev.preventDefault();
setDragging(false);
}}
>
{isFileImported
? FileInputContentFile({ importedFileName, onClearPicker })
: FileInputContentBlank({ isDragging, label })}
export const FileInput = ({
<input
type="file"
className="hidden"
onChange={(ev) => {
if (ev.target.files?.length) {
onChange(ev.target.files);
}
}}
name={name}
ref={innerRef}
accept={accept}
multiple={multiple}
capture={capture}
/>
</label>
);
}
);
export function FileInput({
control,
name,
label,
@@ -201,11 +203,11 @@ export const FileInput = ({
capture?: boolean | 'user' | 'environment';
/**
* Use a translation key!
**/
* */
label?: string;
importedFileName: string | null;
} & InputProps &
Partial<HTMLInputElement>) => {
Partial<HTMLInputElement>) {
return (
<Controller
control={control}
@@ -223,8 +225,8 @@ export const FileInput = ({
capture={capture}
multiple={multiple}
importedFileName={importedFileName}
></FileInputInside>
/>
)}
/>
);
};
}
+95 -93
View File
@@ -22,101 +22,103 @@ export const InputInside = forwardRef<
error?: FieldError;
onChange: () => void;
} & Partial<HTMLInputElement>
>(function AppInput(
{
type,
placeholder,
label,
disabled,
autocomplete,
name,
onChange,
value,
error,
variant = 'primary',
},
ref
) {
const [forceText, setForceText] = useState(false);
>(
(
{
type,
placeholder,
label,
disabled,
autocomplete,
name,
onChange,
value,
error,
variant = 'primary',
},
ref
) => {
const [forceText, setForceText] = useState(false);
const togglePassword = (e: MouseEvent<HTMLDivElement>) => {
e.preventDefault();
setForceText(!forceText);
};
const classes = useMemo(() => {
const variantsMap = {
primary: classNames({
'placeholder:text-background-30 bg-background-60 border-background-60':
!disabled,
'text-background-30 placeholder:text-background-30 border-background-70 bg-background-70':
disabled,
}),
secondary: classNames({
'placeholder:text-background-30 bg-background-50 border-background-50':
!disabled,
'text-background-40 placeholder:text-background-40 border-background-70 bg-background-70':
disabled,
}),
tertiary: classNames({
'placeholder:text-background-30 bg-background-40 border-background-40':
!disabled,
'text-background-30 placeholder:text-background-30 border-background-70 bg-background-70':
disabled,
}),
const togglePassword = (e: MouseEvent<HTMLDivElement>) => {
e.preventDefault();
setForceText(!forceText);
};
return classNames(
variantsMap[variant],
'w-full focus:ring-transparent focus:ring-offset-transparent min-h-[42px] z-10',
'focus:outline-transparent rounded-md focus:border-accent-background-40',
'text-standard relative transition-colors',
error && 'border-status-critical border-1'
const classes = useMemo(() => {
const variantsMap = {
primary: classNames({
'placeholder:text-background-30 bg-background-60 border-background-60':
!disabled,
'text-background-30 placeholder:text-background-30 border-background-70 bg-background-70':
disabled,
}),
secondary: classNames({
'placeholder:text-background-30 bg-background-50 border-background-50':
!disabled,
'text-background-40 placeholder:text-background-40 border-background-70 bg-background-70':
disabled,
}),
tertiary: classNames({
'placeholder:text-background-30 bg-background-40 border-background-40':
!disabled,
'text-background-30 placeholder:text-background-30 border-background-70 bg-background-70':
disabled,
}),
};
return classNames(
variantsMap[variant],
'w-full focus:ring-transparent focus:ring-offset-transparent min-h-[42px] z-10',
'focus:outline-transparent rounded-md focus:border-accent-background-40',
'text-standard relative transition-colors',
error && 'border-status-critical border-1'
);
}, [variant, disabled, error]);
const computedValue = disabled
? placeholder
: value !== undefined
? value
: '';
return (
<label className="flex flex-col gap-1">
{label}
<div className="relative w-full">
<input
type={forceText ? 'text' : type}
className={classNames(classes, {
'pr-10 sentry-mask': type === 'password',
})}
placeholder={placeholder || undefined}
autoComplete={autocomplete ? 'off' : 'on'}
onChange={onChange}
name={name}
value={computedValue} // Do we want that behaviour ?
disabled={disabled}
ref={ref}
/>
{type === 'password' && (
<div
className="fill-background-10 absolute inset-y-0 right-0 pr-6 z-10 my-auto w-[16px] h-[16px] cursor-pointer"
onClick={togglePassword}
>
<EyeIcon width={16} closed={forceText} />
</div>
)}
{error?.message && (
<div className="absolute top-[38px] z-0 pt-1.5 bg-background-70 px-1 w-full rounded-b-md text-status-critical">
{error.message}
</div>
)}
</div>
</label>
);
}, [variant, disabled, error]);
}
);
const computedValue = disabled
? placeholder
: value !== undefined
? value
: '';
return (
<label className="flex flex-col gap-1">
{label}
<div className="relative w-full">
<input
type={forceText ? 'text' : type}
className={classNames(classes, {
'pr-10 sentry-mask': type === 'password',
})}
placeholder={placeholder || undefined}
autoComplete={autocomplete ? 'off' : 'on'}
onChange={onChange}
name={name}
value={computedValue} // Do we want that behaviour ?
disabled={disabled}
ref={ref}
></input>
{type === 'password' && (
<div
className="fill-background-10 absolute inset-y-0 right-0 pr-6 z-10 my-auto w-[16px] h-[16px] cursor-pointer"
onClick={togglePassword}
>
<EyeIcon width={16} closed={forceText}></EyeIcon>
</div>
)}
{error?.message && (
<div className="absolute top-[38px] z-0 pt-1.5 bg-background-70 px-1 w-full rounded-b-md text-status-critical">
{error.message}
</div>
)}
</div>
</label>
);
});
export const Input = ({
export function Input({
type = 'text',
control,
name,
@@ -130,7 +132,7 @@ export const Input = ({
rules?: UseControllerProps<any>['rules'];
control: Control<any>;
} & InputProps &
Partial<HTMLInputElement>) => {
Partial<HTMLInputElement>) {
return (
<Controller
control={control}
@@ -152,8 +154,8 @@ export const Input = ({
onChange={onChange}
ref={ref}
name={name}
></InputInside>
/>
)}
/>
);
};
}
+2 -2
View File
@@ -30,7 +30,7 @@ export function LangSelector({
className="inline-block w-auto h-[1em] -translate-y-[0.05em]"
src={emoji}
/>
{' ' + name}
{` ${name}`}
</div>
),
label: name,
@@ -59,6 +59,6 @@ export function LangSelector({
items={languagesItems}
direction={direction}
alignment={alignment}
></Dropdown>
/>
);
}
@@ -1,8 +1,8 @@
import { Control, Controller } from 'react-hook-form';
import { Button } from './Button';
import { Typography } from './Typography';
import { useCallback, useMemo } from 'react';
import { useLocaleConfig } from '@/i18n/config';
import { Button } from './Button';
import { Typography } from './Typography';
export function NumberSelector({
label,
@@ -38,11 +38,7 @@ export function PersonFrontIcon({
viewBox="0 0 165 392"
xmlns="http://www.w3.org/2000/svg"
>
<image
height={'105%'}
x="8.5%"
href="/images/front-standing-pose.webp"
></image>
<image height={'105%'} x="8.5%" href="/images/front-standing-pose.webp" />
{/* <path d="M84.53 224.074C83.953 230.874 88.569 266.874 90.951 280.984C92.085 287.671 95.195 298.565 94.076 304.349C92.476 312.411 92.017 322.843 92.896 328.918C93.451 332.607 95.196 349.618 92.696 355.845C91.389 359.108 88.996 375.832 88.996 375.832C82.756 391.587 86.278 390.812 86.278 390.812C88.21 393.183 91.519 390.998 91.519 390.998C92.1549 391.464 92.9388 391.682 93.7241 391.612C94.5094 391.542 95.2421 391.188 95.785 390.616C97.949 392.407 100.471 390.396 100.471 390.396C103.189 391.807 105.71 389.205 105.71 389.205C107.271 389.991 107.653 388.998 107.653 388.998C112.337 388.698 105.039 373.706 105.039 373.706C103.291 360.242 106.773 352.748 106.773 352.748C118.178 318.926 118.758 309.948 114.199 297.204C112.915 293.524 112.59 292.067 113.181 290.47C114.547 286.783 113.551 271.953 115.217 266.064C118.431 254.706 121.602 225.903 123.254 212.464C125.475 194.364 115.388 170.088 115.388 170.088C113.179 160.21 116.418 125.016 116.418 125.016C120.941 132.054 120.768 144.477 120.768 144.477C120.05 157.506 131.294 177.42 131.294 177.42C136.694 185.649 138.742 193.456 138.742 194.036C138.742 196.407 138.223 202.145 138.223 202.145L138.43 207.145C138.803 209.721 139.034 212.316 139.123 214.918C138.28 227.953 140.35 225.501 140.35 225.501C142.098 225.501 144.018 215.011 144.018 215.011C144.018 217.711 143.357 225.811 144.818 228.869C146.564 232.512 147.848 228.244 147.871 227.387C148.333 210.787 149.33 215.138 149.33 215.138C150.301 228.602 151.494 231.644 153.63 230.591C155.25 229.818 153.769 214.433 153.769 214.433C156.544 223.572 158.649 225.027 158.649 225.027C163.229 228.243 160.397 219.361 159.76 217.602C156.371 208.256 156.267 205.017 156.267 205.017C160.501 213.417 163.692 213.104 163.692 213.104C167.822 211.786 160.083 199.894 155.548 194.197C153.234 191.297 150.248 187.408 149.384 185.097C147.973 181.188 146.907 168.62 146.907 168.62C146.48 153.79 142.813 147.348 142.813 147.348C136.544 137.314 135.365 118.598 135.365 118.598L135.09 87C132.89 65.445 117.01 65.29 117.01 65.29C100.957 62.9 98.723 57.714 98.723 57.714C95.323 52.821 97.266 43.44 97.266 43.44C100.087 41.145 101.175 35.053 101.175 35.053C105.859 31.461 105.63 26.205 103.466 26.262C101.73 26.308 102.123 24.87 102.123 24.87C105.052 1.208 84.046 0 84.046 0H80.836C80.836 0 59.821 1.208 62.746 24.864C62.746 24.864 63.139 26.304 61.388 26.256C59.23 26.199 59.029 31.456 63.696 35.047C63.696 35.047 64.783 41.137 67.605 43.434C67.605 43.434 69.548 52.814 66.148 57.708C66.148 57.708 63.922 62.894 47.861 65.284C47.861 65.284 31.952 65.44 29.788 86.994L29.488 118.594C29.488 118.594 28.331 137.311 22.038 147.344C22.038 147.344 18.389 153.787 17.967 168.616C17.967 168.616 16.898 181.184 15.492 185.093C14.635 187.393 11.653 191.276 9.32001 194.193C4.74601 199.878 -2.94199 211.745 1.17101 213.1C1.17101 213.1 4.37901 213.412 8.59601 205.013C8.59601 205.013 8.50901 208.229 5.12501 217.598C4.46001 219.334 1.63201 228.217 6.21301 225.024C6.21301 225.024 8.33501 223.567 11.093 214.43C11.093 214.43 9.61301 229.815 11.26 230.588C13.412 231.642 14.586 228.599 15.56 215.135C15.56 215.135 16.56 210.787 17.017 227.384C17.04 228.241 18.295 232.509 20.049 228.866C21.529 225.811 20.864 217.727 20.864 215.008C20.864 215.008 22.764 225.498 24.536 225.498C24.536 225.498 26.624 227.95 25.767 214.915C25.628 212.786 26.375 208.415 26.467 207.142L26.667 202.142C26.667 202.142 26.146 196.417 26.146 194.033C26.146 193.442 28.194 185.646 33.594 177.417C33.594 177.417 44.826 157.494 44.103 144.474C44.103 144.474 43.947 132.051 48.47 125.013C48.47 125.013 51.68 160.205 49.505 170.085C49.505 170.085 39.405 194.358 41.629 212.461C43.27 225.937 46.435 254.702 49.657 266.061C51.34 271.938 50.345 286.761 51.693 290.467C52.301 292.076 51.982 293.558 50.675 297.201C46.141 309.947 46.718 318.925 58.123 352.745C58.123 352.745 61.633 360.239 59.859 373.703C59.859 373.703 52.572 388.695 57.239 388.995C57.239 388.995 57.604 389.988 59.182 389.202C59.182 389.202 61.703 391.802 64.427 390.393C64.427 390.393 66.95 392.407 69.106 390.613C69.6451 391.185 70.3751 391.54 71.158 391.61C71.9409 391.681 72.7225 391.462 73.355 390.995C73.355 390.995 76.664 393.227 78.63 390.809C78.63 390.809 82.123 391.584 75.904 375.829C75.904 375.829 73.522 359.129 72.209 355.842C69.709 349.621 71.474 332.57 72.009 328.915C72.87 322.806 72.409 312.398 70.835 304.346C69.684 298.575 72.801 287.679 73.952 280.981C76.317 266.881 80.952 230.881 80.373 224.071L82.288 224.743C83.0863 224.756 83.8692 224.522 84.53 224.074Z" /> */}
<circle
className="body-part-circle"
+3 -2
View File
@@ -21,6 +21,7 @@ export function ProgressBar({
{Array.from({ length: parts }).map((_, key) => (
<Bar
index={key}
// eslint-disable-next-line react/no-array-index-key
key={key}
progress={progress}
height={height}
@@ -28,7 +29,7 @@ export function ProgressBar({
animated={animated}
parts={parts}
bottom={bottom}
></Bar>
/>
))}
</div>
);
@@ -74,7 +75,7 @@ export function Bar({
width: `${value * 100}%`,
height: `${height}px`,
}}
></div>
/>
</div>
);
}
+2 -2
View File
@@ -1,7 +1,7 @@
import classNames from 'classnames';
import { Control, Controller } from 'react-hook-form';
import { Typography } from './Typography';
import { ReactNode } from 'react';
import { Typography } from './Typography';
export function Radio({
control,
@@ -49,7 +49,7 @@ export function Radio({
{...props}
/>
<div className="flex flex-col gap-2 pointer-events-none">
{children ? children : <Typography bold>{label}</Typography>}
{children || <Typography bold>{label}</Typography>}
{description && (
<Typography variant="standard" color="secondary">
{description}
+2
View File
@@ -42,6 +42,7 @@ export function Range({
/>
<datalist id={`${name}-datalist`} className="">
{values.map(({ value }, i) => (
// eslint-disable-next-line react/no-array-index-key
<option key={i}>{value}</option>
))}
</datalist>
@@ -54,6 +55,7 @@ export function Range({
);
return (
<span
// eslint-disable-next-line react/no-array-index-key
key={i}
className={classNames(
'flex-1',
@@ -4,8 +4,8 @@ import {
RefCallBack,
UseControllerProps,
} from 'react-hook-form';
import { FileInputContentBlank, FileInputContentFile } from './FileInput';
import { open } from '@tauri-apps/plugin-dialog';
import { FileInputContentBlank, FileInputContentFile } from './FileInput';
export function InnerTauriFileInput({
label,
@@ -43,7 +43,7 @@ export function TauriFileInput({
control: Control<any>;
/**
* Use a translation key!
**/
* */
label: string;
name: string;
directory?: boolean;
+3 -3
View File
@@ -1,8 +1,8 @@
import { ReactNode } from 'react';
import classNames from 'classnames';
import { BulbIcon } from './icon/BulbIcon';
import { WarningIcon } from './icon/WarningIcon';
import { Typography } from './Typography';
import classNames from 'classnames';
export function TipBox({
children,
@@ -28,7 +28,7 @@ export function TipBox({
hideIcon && 'hidden'
)}
>
<BulbIcon></BulbIcon>
<BulbIcon />
</div>
<div className="flex flex-col">
<Typography
@@ -62,7 +62,7 @@ export function WarningBox({
hideIcon && 'hidden'
)}
>
<WarningIcon></WarningIcon>
<WarningIcon />
</div>
<div className="flex flex-col justify-center w-full">
<Typography
+9 -4
View File
@@ -28,12 +28,12 @@ interface TooltipPos {
height?: number;
}
type Rect = {
interface Rect {
left: number;
top: number;
width: number;
height: number;
};
}
function overlapArea(rect1: Rect, rect2: Rect) {
// Find the overlap in the x direction (width)
@@ -273,6 +273,8 @@ export function FloatingTooltip({
elem.removeEventListener('mouseleave', onMouseLeave);
};
}
return undefined;
}, []);
useLayoutEffect(() => {
@@ -395,6 +397,8 @@ export function DrawerTooltip({
clearTimeout(touchTimeout.current);
};
}
return undefined;
}, []);
return (
@@ -406,7 +410,7 @@ export function DrawerTooltip({
opacity: drawerStyle ? 0.5 : 0,
pointerEvents: drawerStyle ? 'all' : 'none',
}}
></div>
/>
<div
className={classNames(
'fixed z-50 w-full text-background-10 max-h-full -bottom-full transition-all overflow-clip'
@@ -422,10 +426,11 @@ export function DrawerTooltip({
Pro tip
</Typography>
<button
type="button"
className="absolute right-4 top-3 h-6 w-6 bg-background-70 rounded-full flex justify-center items-center"
onClick={() => close()}
>
<CloseIcon size={20} className="stroke-white"></CloseIcon>
<CloseIcon size={20} className="stroke-white" />
</button>
</div>
<div
@@ -1,6 +1,4 @@
import classNames from 'classnames';
import { CheckIcon } from './icon/CheckIcon';
import { Typography } from './Typography';
import {
FC,
ReactNode,
@@ -11,6 +9,8 @@ import {
} from 'react';
import { useElemSize } from '@/hooks/layout';
import { useDebouncedEffect } from '@/hooks/timeout';
import { Typography } from './Typography';
import { CheckIcon } from './icon/CheckIcon';
export function VerticalStep({
active,
@@ -66,7 +66,7 @@ export function VerticalStep({
)}
>
{isPrevious ? (
<CheckIcon></CheckIcon>
<CheckIcon />
) : (
<Typography variant="section-title">{index + 1}</Typography>
)}
@@ -88,19 +88,19 @@ export function VerticalStep({
);
}
export type VerticalStepComponentProps = {
export interface VerticalStepComponentProps {
nextStep: () => void;
prevStep: () => void;
goTo: (id: string) => void;
isActive: boolean;
};
}
type VerticalStepComponentType = FC<VerticalStepComponentProps>;
export type VerticalStep = {
export interface VerticalStep {
title: string;
id?: string;
component: VerticalStepComponentType;
};
}
export default function VerticalStepper({
steps,
@@ -135,13 +135,14 @@ export default function VerticalStepper({
return (
<ol className="relative border-l border-gray-700 text-gray-400">
{steps.map(({ title, component: StepComponent }, index) => (
// eslint-disable-next-line react/no-array-index-key
<VerticalStep active={currStep} index={index} title={title} key={index}>
<StepComponent
nextStep={nextStep}
prevStep={prevStep}
goTo={goTo}
isActive={currStep === index}
></StepComponent>
/>
</VerticalStep>
))}
</ol>
@@ -11,7 +11,7 @@ export function BatteryIcon({
charging: boolean;
}) {
const col = useMemo(() => {
const colorsMap: { [key: number]: string } = {
const colorsMap: Record<number, string> = {
0.4: 'fill-status-success',
0.2: 'fill-status-warning',
0: 'fill-status-critical',
@@ -7,7 +7,7 @@ export function ChestIcon({ width = 24 }: { width?: number }) {
width={width}
viewBox="0 0 50 50"
>
<path d="M 20 2 C 18.156 2 16.700141 3.1345312 15.619141 4.0195312 C 12.698141 4.2755313 4 7.245 4 15 C 4 17.305 4.551 19.068203 4.875 19.908203 C 4.262 20.969203 3 23.679 3 28 C 3 28.352 3.184375 28.677422 3.484375 28.857422 L 8.484375 31.857422 C 8.835375 32.068422 9.2804219 32.044922 9.6074219 31.794922 C 10.290422 31.270922 10.833578 30.512578 11.267578 29.642578 C 11.118578 28.880578 11 28.05 11 27 L 11 21 C 11 20.448 11.448 20 12 20 C 12.43 20 12.790641 20.27425 12.931641 20.65625 C 12.944641 20.68425 12.982 20.797656 13 20.847656 C 13.197 21.404656 14.365 24 19 24 C 23.133 24 23.984531 19.976687 24.019531 19.804688 C 24.113531 19.329687 24.535 19.018531 25 19.019531 C 25.465 19.019531 25.886469 19.330687 25.980469 19.804688 C 26.015469 19.976687 26.867 24 31 24 C 35.635 24 36.803 21.405656 37 20.847656 C 37.018 20.797656 37.055359 20.68425 37.068359 20.65625 C 37.209359 20.27525 37.57 20 38 20 C 38.552 20 39 20.448 39 21 L 39 27 C 39 28.05 38.881422 28.881578 38.732422 29.642578 C 39.166422 30.513578 39.709578 31.269969 40.392578 31.792969 C 40.719578 32.042969 41.164625 32.066469 41.515625 31.855469 L 46.515625 28.855469 C 46.815625 28.676469 47 28.352 47 28 C 47 23.679 45.738 20.969203 45.125 19.908203 C 45.449 19.068203 46 17.305 46 15 C 46 7.245 37.301859 4.2755312 34.380859 4.0195312 C 33.299859 3.1345312 31.844 2 30 2 L 25 2 L 20 2 z M 25 22.609375 C 23.953 24.323375 22.059 26 19 26 C 16.075 26 14.195 25.130766 13 24.134766 L 13 27 C 13 28.281 13.194875 29.155016 13.421875 30.166016 C 13.692875 31.375016 14 32.746 14 35 C 14 35.027 13.987375 35.049172 13.984375 35.076172 C 13.994375 35.366172 14 35.669 14 36 L 14 42 C 14 44.997 18.628641 47.438484 19.556641 47.896484 C 19.693641 47.965484 19.847 48 20 48 L 25 48 L 30 48 C 30.153 48 30.306359 47.965484 30.443359 47.896484 C 31.371359 47.438484 36 44.997 36 42 L 36 36 C 36 35.669 36.005625 35.366172 36.015625 35.076172 C 36.012625 35.049172 36 35.027 36 35 C 36 32.746 36.307125 31.375016 36.578125 30.166016 C 36.805125 29.155016 37 28.281 37 27 L 37 24.134766 C 35.805 25.130766 33.925 26 31 26 C 27.941 26 26.047 24.323375 25 22.609375 z"></path>
<path d="M 20 2 C 18.156 2 16.700141 3.1345312 15.619141 4.0195312 C 12.698141 4.2755313 4 7.245 4 15 C 4 17.305 4.551 19.068203 4.875 19.908203 C 4.262 20.969203 3 23.679 3 28 C 3 28.352 3.184375 28.677422 3.484375 28.857422 L 8.484375 31.857422 C 8.835375 32.068422 9.2804219 32.044922 9.6074219 31.794922 C 10.290422 31.270922 10.833578 30.512578 11.267578 29.642578 C 11.118578 28.880578 11 28.05 11 27 L 11 21 C 11 20.448 11.448 20 12 20 C 12.43 20 12.790641 20.27425 12.931641 20.65625 C 12.944641 20.68425 12.982 20.797656 13 20.847656 C 13.197 21.404656 14.365 24 19 24 C 23.133 24 23.984531 19.976687 24.019531 19.804688 C 24.113531 19.329687 24.535 19.018531 25 19.019531 C 25.465 19.019531 25.886469 19.330687 25.980469 19.804688 C 26.015469 19.976687 26.867 24 31 24 C 35.635 24 36.803 21.405656 37 20.847656 C 37.018 20.797656 37.055359 20.68425 37.068359 20.65625 C 37.209359 20.27525 37.57 20 38 20 C 38.552 20 39 20.448 39 21 L 39 27 C 39 28.05 38.881422 28.881578 38.732422 29.642578 C 39.166422 30.513578 39.709578 31.269969 40.392578 31.792969 C 40.719578 32.042969 41.164625 32.066469 41.515625 31.855469 L 46.515625 28.855469 C 46.815625 28.676469 47 28.352 47 28 C 47 23.679 45.738 20.969203 45.125 19.908203 C 45.449 19.068203 46 17.305 46 15 C 46 7.245 37.301859 4.2755312 34.380859 4.0195312 C 33.299859 3.1345312 31.844 2 30 2 L 25 2 L 20 2 z M 25 22.609375 C 23.953 24.323375 22.059 26 19 26 C 16.075 26 14.195 25.130766 13 24.134766 L 13 27 C 13 28.281 13.194875 29.155016 13.421875 30.166016 C 13.692875 31.375016 14 32.746 14 35 C 14 35.027 13.987375 35.049172 13.984375 35.076172 C 13.994375 35.366172 14 35.669 14 36 L 14 42 C 14 44.997 18.628641 47.438484 19.556641 47.896484 C 19.693641 47.965484 19.847 48 20 48 L 25 48 L 30 48 C 30.153 48 30.306359 47.965484 30.443359 47.896484 C 31.371359 47.438484 36 44.997 36 42 L 36 36 C 36 35.669 36.005625 35.366172 36.015625 35.076172 C 36.012625 35.049172 36 35.027 36 35 C 36 32.746 36.307125 31.375016 36.578125 30.166016 C 36.805125 29.155016 37 28.281 37 27 L 37 24.134766 C 35.805 25.130766 33.925 26 31 26 C 27.941 26 26.047 24.323375 25 22.609375 z" />
</svg>
);
}
@@ -23,23 +23,23 @@ export function ControllerIcon({
<path
d="M118.822 208.203c-2.618-.617-4.697-3.542-5.882-8.273-.291-1.162-.298-1.318-.28-6.087.025-6.892.614-23.54.873-24.712.407-1.836.45-2.166.39-2.962-.101-1.363-.496-2.192-1.523-3.2-1.327-1.302-3.303-2.24-6.48-3.078-1.73-.456-3.586-1.518-6.604-3.78-3.429-2.571-4.412-3.847-7.412-9.617-.584-1.123-1.155-2.09-1.27-2.152-.259-.138-1.272-.289-5.165-.769-3.5-.43-6.014-.807-6.642-.992-.827-.245-1.493-1.177-2.218-3.103-.921-2.446-2.059-8.04-2.059-10.122 0-2.587 1.23-6.419 2.836-8.832.83-1.247 1.148-1.489 2.265-1.723 7.263-1.526 53.58-5.18 66.688-5.262 3.11-.019 3.213-.012 3.65.26 1.497.931 3.276 3.686 4.198 6.502.86 2.622 1.011 4.66.57 7.652-.873 5.938-2.877 9.425-6.303 10.969-.767.345-1.928.65-3.119.822-.955.137-1.121.36-1.443 1.948-.523 2.573-1.864 5.5-4.178 9.114-1.084 1.694-1.407 2.78-2.776 9.339-1.166 5.587-1.297 6.347-1.893 11.008-.914 7.15-2.987 22.105-3.276 23.631-.85 4.5-4.377 9.213-9.243 12.352-1.778 1.146-2.492 1.352-3.704 1.067zm-1.16-48.81c4.208-.596 8.777-2.031 12.644-3.97 5.698-2.858 9.94-7.053 11.599-11.471.494-1.315.643-2.34.42-2.88-.147-.354-.203-.38-.802-.38-.78 0-5.773.591-14.198 1.683-6.609.855-9.629 1.2-13.24 1.511-4.913.423-10.917.694-15.438.696-1.622 0-3.59.038-4.373.083-1.345.078-1.431.099-1.561.385-.206.452.06 1.523.715 2.881 1.05 2.177 2.932 4.619 4.83 6.27 5.185 4.512 11.77 6.274 19.405 5.192z"
transform="scale(.26458)"
></path>
/>
<path
d="M111.38 158.518c-4.784-.43-8.953-2.192-12.419-5.25-1.997-1.763-4.05-4.546-4.817-6.531l-.371-.963 5.355-.078c5.019-.074 10.45-.275 11.662-.432.514-.067.533-.057.533.272 0 .498.536 1.333 1.111 1.732 1.473 1.02 3.312 1.046 5.07.434 1.981-.69 2.783-1.579 2.79-2.727l.002-.577 2.26-.276c1.242-.151 4.913-.616 8.157-1.033 7.376-.947 10.484-1.306 10.568-1.222.135.135-.508 1.937-1.101 3.092-2.017 3.922-6.233 7.574-11.529 9.985-5.871 2.674-12.356 4.016-17.272 3.574zm20.458-8.081c.958-.439 1.503-.858 1.904-1.464 1.196-1.808-.01-3.98-2.721-4.896-.637-.216-1.009-.263-1.75-.22-1.096.064-1.542.264-2.423 1.084-1.089 1.013-1.487 2.354-1.026 3.457.397.949 1.521 1.89 2.731 2.285.858.28 2.388.165 3.285-.246z"
transform="scale(.26458)"
></path>
/>
<path
d="M109.855 171.583c-.839-.29-1.655-.856-1.744-1.21-.04-.163.093-.688.324-1.268.588-1.483.61-2.105.143-3.918-.463-1.793-.495-2.343-.15-2.528 1.115-.596 3.07 1.299 3.795 3.679.243.797.25.956.114 2.196-.193 1.752-.4 2.931-.548 3.126-.173.226-1.173.186-1.934-.077z"
transform="scale(.26458)"
></path>
/>
<path
d="M128.454 149.37c-.797-.376-1.472-1.276-1.603-1.798-.207-.822.52-1.842 1.577-2.38 1.397-.714 3.825.066 4.176 1.128.35 1.062.33 2.041-.436 2.602-1.214.889-2.465 1.04-3.714.449z"
transform="scale(.26458)"
></path>
/>
<path
d="M113.895 146.8c-.662-.31-1.51-1.648-1.238-1.67l6.153-.485c.284-.023-.434 1.493-1.413 1.947-1.272.591-2.557.65-3.502.207z"
transform="scale(.26458)"
></path>
/>
</g>
</g>
</svg>
@@ -17,7 +17,7 @@ export function CrossIcon({
fillRule="evenodd"
d="M4.293 4.293a1 1 0 011.414 0L10 8.586l4.293-4.293a1 1 0 111.414 1.414L11.414 10l4.293 4.293a1 1 0 01-1.414 1.414L10 11.414l-4.293 4.293a1 1 0 01-1.414-1.414L8.586 10 4.293 5.707a1 1 0 010-1.414z"
clipRule="evenodd"
></path>
/>
</svg>
);
}
+1 -1
View File
@@ -16,7 +16,7 @@ export function FootIcon({
<path
transform={flipped ? undefined : 'scale(-1,1) translate(-28,0)'}
d="M11.5 3A1.5 2 0 0 0 10 5a1.5 2 0 0 0 1.5 2A1.5 2 0 0 0 13 5a1.5 2 0 0 0-1.5-2zm3.244.678a1 1.333 0 0 0-1 1.334 1 1.333 0 0 0 1 1.332 1 1.333 0 0 0 1-1.332 1 1.333 0 0 0-1-1.334zm2.33 1.039a.863 1.151 0 0 0-.861 1.15.863 1.151 0 0 0 .861 1.15.863 1.151 0 0 0 .863-1.15.863 1.151 0 0 0-.863-1.15zm1.582 1.863a.611.815 0 0 0-.61.815.611.815 0 0 0 .61.816.611.815 0 0 0 .612-.816.611.815 0 0 0-.612-.815zM13.918 8C11.629 8 10 9.731 10 12c0 2.887 3 2.82 3 5 0 1.604-1.272 2.766-1.781 4.295a3.5 3.5 0 0 0-.096.305c-.014.054-.031.108-.043.164a3.5 3.5 0 0 0-.08.736 3.5 3.5 0 0 0 3.5 3.5 3.5 3.5 0 0 0 3.5-3.5c0-3.91 1.998-5.5 1.998-8.5 0-3.612-3.317-6-6.08-6zm5.582.666a.5.667 0 0 0-.5.666.5.667 0 0 0 .5.668.5.667 0 0 0 .5-.668.5.667 0 0 0-.5-.666z"
></path>
/>
</svg>
);
}
@@ -4,7 +4,7 @@ export function HeadsetIcon({ width = 24 }: { width?: number }) {
<path
transform="scale(0.75, 0.75) translate(120, 96)"
d="M576 64H64C28.7 64 0 92.7 0 128v256c0 35.3 28.7 64 64 64h120.4c24.2 0 46.4-13.7 57.2-35.4l32-64c8.8-17.5 26.7-28.6 46.3-28.6s37.5 11.1 46.3 28.6l32 64c10.8 21.7 33 35.4 57.2 35.4H576c35.3 0 64-28.7 64-64V128c0-35.3-28.7-64-64-64zM96 240a64 64 0 11128 0 64 64 0 11-128 0zm384-64a64 64 0 110 128 64 64 0 110-128z"
></path>
/>
</svg>
);
}
@@ -1,8 +1,8 @@
export function HumanIcon({ width = 20 }: { width?: number }) {
return (
<svg xmlns="http://www.w3.org/2000/svg" width={width} viewBox="0 0 512 512">
<path d="M256 112a56 56 0 1156-56 56.06 56.06 0 01-56 56z"></path>
<path d="M432 112.8l-.45.12-.42.13c-1 .28-2 .58-3 .89-18.61 5.46-108.93 30.92-172.56 30.92-59.13 0-141.28-22-167.56-29.47a73.79 73.79 0 00-8-2.58c-19-5-32 14.3-32 31.94 0 17.47 15.7 25.79 31.55 31.76v.28l95.22 29.74c9.73 3.73 12.33 7.54 13.6 10.84 4.13 10.59.83 31.56-.34 38.88l-5.8 45-32.19 176.19q-.15.72-.27 1.47l-.23 1.27c-2.32 16.15 9.54 31.82 32 31.82 19.6 0 28.25-13.53 32-31.94s28-157.57 42-157.57 42.84 157.57 42.84 157.57c3.75 18.41 12.4 31.94 32 31.94 22.52 0 34.38-15.74 32-31.94a57.17 57.17 0 00-.76-4.06L329 301.27l-5.79-45c-4.19-26.21-.82-34.87.32-36.9a1.09 1.09 0 00.08-.15c1.08-2 6-6.48 17.48-10.79l89.28-31.21a16.9 16.9 0 001.62-.52c16-6 32-14.3 32-31.93S451 107.81 432 112.8z"></path>
<path d="M256 112a56 56 0 1156-56 56.06 56.06 0 01-56 56z" />
<path d="M432 112.8l-.45.12-.42.13c-1 .28-2 .58-3 .89-18.61 5.46-108.93 30.92-172.56 30.92-59.13 0-141.28-22-167.56-29.47a73.79 73.79 0 00-8-2.58c-19-5-32 14.3-32 31.94 0 17.47 15.7 25.79 31.55 31.76v.28l95.22 29.74c9.73 3.73 12.33 7.54 13.6 10.84 4.13 10.59.83 31.56-.34 38.88l-5.8 45-32.19 176.19q-.15.72-.27 1.47l-.23 1.27c-2.32 16.15 9.54 31.82 32 31.82 19.6 0 28.25-13.53 32-31.94s28-157.57 42-157.57 42.84 157.57 42.84 157.57c3.75 18.41 12.4 31.94 32 31.94 22.52 0 34.38-15.74 32-31.94a57.17 57.17 0 00-.76-4.06L329 301.27l-5.79-45c-4.19-26.21-.82-34.87.32-36.9a1.09 1.09 0 00.08-.15c1.08-2 6-6.48 17.48-10.79l89.28-31.21a16.9 16.9 0 001.62-.52c16-6 32-14.3 32-31.93S451 107.81 432 112.8z" />
</svg>
);
}
@@ -20,28 +20,28 @@ export function LoaderIcon({
alt="Slime jumping"
width={size}
// className="crisp-edges"
></img>
/>
<img
hidden={slimeState !== SlimeState.HAPPY}
src="/images/happy-slime.gif"
alt="Happy slime"
width={size}
// className="crisp-edges"
></img>
/>
<img
hidden={slimeState !== SlimeState.SAD}
src="/images/sad-slime.gif"
alt="Sad slime"
width={size}
// className="crisp-edges"
></img>
/>
<img
hidden={slimeState !== SlimeState.CURIOUS}
src="/images/curious-slime.gif"
alt="Slime looking for something"
width={size}
// className="crisp-edges"
></img>
/>
</>
);
}
@@ -16,7 +16,7 @@ export function LowerArmIcon({
<path
transform={flipped ? 'scale(-1,1) translate(-50,0)' : undefined}
d="M27.203 1.98c-1.019 0-1.954.56-2.437 1.458L17.26 15.858c-.157.291-.24.619-.24.95v16.22l-4.74 5.49a1.001 1.001 0 0 0 .156 1.407l9.386 7.818a.998.998 0 0 0 1.416-.17l8.354-10.443a13.001 13.001 0 0 0 2.668-7.072L35 20.83A2.83 2.83 0 0 0 32.17 18h-.008a2.83 2.83 0 0 0-2.73 2.086l-2.41 5.935-2.026-3.019L25 16l4.734-10.09c.847-1.836-.491-3.93-2.513-3.93h-.018z"
></path>
/>
</svg>
);
}
+1 -1
View File
@@ -15,7 +15,7 @@ export function PawIcon({
<path
transform={`${transform} scale(0.75, 0.75) translate(96, 96)`}
d="M490.39 182.75c-5.55-13.19-14.77-22.7-26.67-27.49l-.16-.06a46.46 46.46 0 00-17-3.2h-.64c-27.24.41-55.05 23.56-69.19 57.61-10.37 24.9-11.56 51.68-3.18 71.64 5.54 13.2 14.78 22.71 26.73 27.5l.13.05a46.53 46.53 0 0017 3.2c27.5 0 55.6-23.15 70-57.65 10.24-24.87 11.37-51.63 2.98-71.6zM381.55 329.61c-15.71-9.44-30.56-18.37-40.26-34.41C314.53 250.8 298.37 224 256 224s-58.57 26.8-85.39 71.2c-9.72 16.06-24.6 25-40.36 34.48-18.07 10.86-36.74 22.08-44.8 44.16a66.93 66.93 0 00-4.65 25c0 35.95 28 65.2 62.4 65.2 17.75 0 36.64-6.15 56.63-12.66 19.22-6.26 39.09-12.73 56.27-12.73s37 6.47 56.15 12.73C332.2 457.85 351 464 368.8 464c34.35 0 62.3-29.25 62.3-65.2a67 67 0 00-4.75-25c-8.06-22.1-26.74-33.33-44.8-44.19zM150 188.85c11.9 14.93 27 23.15 42.52 23.15a42.88 42.88 0 006.33-.47c32.37-4.76 52.54-44.26 45.92-90C242 102.3 234.6 84.39 224 71.11 212.12 56.21 197 48 181.49 48a42.88 42.88 0 00-6.33.47c-32.37 4.76-52.54 44.26-45.92 90 2.76 19.2 10.16 37.09 20.76 50.38zm163.16 22.68a42.88 42.88 0 006.33.47c15.53 0 30.62-8.22 42.52-23.15 10.59-13.29 17.95-31.18 20.75-50.4 6.62-45.72-13.55-85.22-45.92-90a42.88 42.88 0 00-6.33-.47C315 48 299.88 56.21 288 71.11c-10.6 13.28-18 31.19-20.76 50.44-6.62 45.72 13.55 85.22 45.92 89.98zM111.59 308.8l.14-.05c11.93-4.79 21.16-14.29 26.69-27.48 8.38-20 7.2-46.75-3.15-71.65C120.94 175.16 92.85 152 65.38 152a46.4 46.4 0 00-17 3.2l-.14.05c-11.9 4.75-21.13 14.29-26.66 27.48-8.38 20-7.2 46.75 3.15 71.65C39.06 288.84 67.15 312 94.62 312a46.4 46.4 0 0016.97-3.2z"
></path>
/>
</svg>
);
}
@@ -15,11 +15,11 @@ export function SlimeUpIcon({ width = 60 }: { width?: number }) {
strokeWidth="0.265"
rx="6.963"
ry="3.423"
></rect>
/>
<path
strokeWidth="0.195"
d="M59.587 23.923c.514 0 .978.382 1.313 1.001.336.62.402 1.512.543 2.425l1.376 8.937v40.902l-1.38 8.95c-.14.917-.206 1.805-.542 2.425-.335.619-.8 1.001-1.314 1.001-1.028 0-2.14-1.59-1.856-3.427l1.38-8.949V36.286l-1.377-8.937c-.281-1.826.828-3.426 1.857-3.426z"
></path>
/>
</g>
</svg>
);
@@ -9,13 +9,13 @@ export function SlimeVRIcon({ width = 28 }: { width?: number }) {
viewBox="0 0 380 380"
>
<g fill="none" stroke="#fff">
<path strokeWidth="13.62" d="M72.867 191.74l37-39 39 36"></path>
<path strokeWidth="13.62" d="M208.87 187.74l38-35 36 38"></path>
<path strokeWidth="13.62" d="M72.867 191.74l37-39 39 36" />
<path strokeWidth="13.62" d="M208.87 187.74l38-35 36 38" />
<path
strokeLinecap="square"
strokeWidth="17"
d="M56.867 253.74s130.61-31.182 248 5c13.45 4.146 20.244 2.975 20-8s1.909-126.06-46-131"
></path>
/>
</g>
</svg>
);
@@ -11,11 +11,11 @@ export function TaybolIcon({ width = 784 }: { width?: string | number }) {
<path
strokeWidth="0.234"
d="M102.747 171.401l-8.467-3.77-.07-25.96-.07-25.958-25.727-11.386-25.727-11.385-.067 17.959-.068 17.959-1.387.689c-1.938.962-15.39 7.134-15.85 7.273-.375.112-17.638-7.406-18.012-7.844-.107-.126-.194-15.36-.194-33.855 0-18.494.087-33.733.194-33.863.426-.519 102.33-47.274 102.868-47.197.299.042 23.962 10.446 52.586 23.118l52.042 23.041v67.955l-8.614 3.96c-4.738 2.177-8.757 3.956-8.93 3.954-.174-.002-4.245-1.75-9.047-3.883l-8.731-3.878-.132-17.81-.133-17.809-24.793 11.398-24.794 11.397-.011 25.893c-.01 20.456-.08 25.937-.342 26.103-1.434.913-16.748 7.7-17.342 7.687-.413-.01-4.3-1.613-9.182-3.788zm8.666-47.957c-.165-.128-4.51-2.073-14.818-6.63l-1.389-.614V167.09l8.136 3.603 8.136 3.604.067-25.35c.037-13.942-.022-25.419-.132-25.504zm10.78 46.417l6.218-2.874.068-25.474.067-25.474-3.64 1.678-8.07 3.724-4.432 2.046v50.87l1.786-.81c.982-.446 4.584-2.105 8.004-3.686zm-97.637-59.58l-.007-25.4-7.973-3.519c-4.386-1.934-8.074-3.549-8.196-3.586-.122-.038-.222 11.37-.222 25.352v25.42l8.004 3.558c4.402 1.957 8.093 3.562 8.202 3.567.11.005.195-11.422.192-25.392zm9.361 21.686l7.843-3.61V92.52l-6.534-2.89c-3.594-1.588-7.226-3.196-8.07-3.573l-1.535-.684v25.17c0 13.874.101 25.141.226 25.103.125-.038 3.756-1.694 8.07-3.68zm162.89-22.136v-25.23l-8.196 3.761-8.194 3.76.058 17.868.06 17.867 8.07 3.59c4.438 1.973 8.099 3.594 8.135 3.601.036.007.066-11.34.066-25.217zm9.17 21.454l7.755-3.57.004-25.4c.003-13.971-.045-25.402-.104-25.402-.06 0-3.602 1.609-7.872 3.575l-7.763 3.574-.067 25.396c-.037 13.968.014 25.396.113 25.396.098 0 3.67-1.606 7.934-3.57zm-94.43-23.43C110.804 107.482 8.392 62.22 8.294 62.22c-.078 0-.11 3.272-.072 7.272l.07 7.271 51.593 22.843 51.594 22.843.07-7.28c.038-4.004.038-7.296 0-7.315zm51.55-8.679l50.51-23.262.07-7.26c.038-3.993-.022-7.256-.133-7.25-.11.005-22.883 10.46-50.605 23.233l-50.403 23.223-.07 7.29c-.037 4.008-.026 7.288.026 7.288s22.824-10.468 50.605-23.262zm-.66-15.245c27.707-12.756 50.46-23.256 50.564-23.333.22-.163-102.39-45.643-102.982-45.645-.41 0-101.054 46.25-101.062 46.444-.004.078 102.892 45.728 103.072 45.728.017 0 22.7-10.437 50.408-23.194z"
></path>
/>
<path
strokeWidth="0.076"
d="M95.553 93.605c-3.231-.733-4.092-2.287-2.04-3.68.963-.654 1.331-1.21 1.545-2.333.194-1.016.473-1.49.969-1.639.133-.04.17-.107.17-.313v-.262L93.2 82.085c-1.648-1.81-3.03-3.292-3.07-3.292-.098 0-1.55.945-1.616 1.052a.207.207 0 01-.159.084c-.059 0-.258.15-.443.335-.34.34-.85.65-1.07.65-.066 0-.362.192-.657.427l-.536.428-1.19-.044-1.19-.044-.265.354c-.145.196-.513.696-.818 1.113-1.158 1.583-3.71 3.764-5.019 4.289-3.017 1.209-6.52-.056-6.528-2.358-.004-1.13.201-1.427 1.872-2.702 1.469-1.12 2.472-2.105 3.285-3.221.735-1.01 1.384-1.745 1.71-1.938.126-.074.197-.17.177-.24a5.189 5.189 0 01-.082-.391c-.055-.312-.112-.246.805-.94.359-.272.69-.578.737-.68.163-.358.315-.183.318.367.01 1.905 4.619 4.319 7.548 3.953l.402-.05V77.05h-.752c-3.375 0-6.996-1.923-7.364-3.912-.164-.88.147-1.615.728-1.724.205-.039.3-.122.466-.406.268-.458.95-1.178 1.416-1.493.275-.187.334-.258.242-.293-1.777 1.084-4.464 1.556-6.418.756-.386-.17-.36-.089.036.113 1.209.617 3.316.694 4.581.169.514-.214.583.053.073.279-2.037.9-5.403.127-6.157-1.415-.657-1.343-.2-2.285 1.867-3.854 1.36-1.033 2.362-2.023 3.138-3.102.807-1.122 1.218-1.603 1.569-1.835l.294-.195-.046-.424-.046-.423.517-.378c.689-.504 1.085-.867 1.085-.994 0-.367.21-.047.244.37.165 2.052 4.552 4.398 7.537 4.031l.398-.049V60.11l-1.117-.046c-2.575-.105-5.2-1.236-6.414-2.762-.84-1.056-.776-2.524.124-2.817.278-.09.377-.173.512-.427.238-.449.831-1.09 1.317-1.425.927-.641.93-.646 1.83-1.059.895-.414 1.73-.68 2.603-.83 1.068-.186 1.08-.183 1.902-.16.973.025 1.745.166 2.712.495.367.125.67.19.694.151.108-.173.807-.229 2.293-.182 2.05.065 2.522-.06 4.014-1.055l.587-.391v-.385c0-.454.016-.476.785-1.095.89-.715 1.199-.797 1.858-.49.224.105.416.181.425.17l.589-.82c.532-.743.988-1.235 1.396-1.51l.17-.114-.077-.33c-.083-.358-.04-.615.104-.62.148-.006 1.295-.936 1.376-1.116.157-.353.341-.154.341.369 0 1.81 3.887 3.928 7.214 3.93l.738.001v-2.272h-.898c-3.385 0-6.973-1.994-7.252-4.03-.11-.807.275-1.574.791-1.574.165 0 .239-.068.392-.358.238-.45.931-1.197 1.422-1.532.859-.6.863-.603 1.705-.974 1.04-.46 1.868-.725 2.667-.851.333-.053.622-.12.643-.148.183-.25 3.163.16 4.301.593.303.115.395.127.395.05 0-.17.446-.225 1.514-.188 2.696.093 3.42-.076 4.865-1.138l.51-.374-.046-.228c-.075-.372.1-.64.755-1.157.784-.62.87-.663 1.318-.663h.368l3.14 1.776c3.417 1.932 3.405 1.923 3.401 2.579-.002.458-.024.488-.817 1.122-.705.563-1.086.72-1.47.607l-.247-.073-.417.311c-1.675 1.254-2.27 1.432-4.809 1.437l-1.893.004-.318.215a2.808 2.808 0 00-.593.616l-.276.4.13.252c.072.138.18.302.243.364.087.087.102.218.066.561-.074.71-.144.79-.893 1.04-.778.259-1.35.518-1.35.612 0 .037-.035.067-.077.067-.042 0-.218.103-.39.228a2.744 2.744 0 01-.691.34c-.653.194-3.458 1.77-4.734 2.66-.263.182-.508.332-.546.332-.038 0-.199.14-.356.31-.312.337-.767.627-1.11.707-.12.027-.443.23-.72.45l-.502.4-1.173-.053-1.172-.054-.098.123c-.054.068-.378.516-.72.995-.382.535-1.003 1.251-1.608 1.858l-.985.987.675-.291c.75-.325 1.787-.622 2.449-.704.24-.03.452-.076.473-.104.181-.243 3.113.15 4.148.557.373.146.46.158.517.07.123-.189.904-.255 2.036-.174 1.95.14 2.803-.077 4.262-1.083l.549-.378v-.784l.246-.23c1.125-1.045 1.745-1.289 2.404-.945.415.216.372.24.87-.464.643-.908 1.04-1.357 1.39-1.572.191-.117.298-.233.279-.303-.19-.692-.196-.68.745-1.363.316-.23.617-.51.67-.625.183-.393.362-.222.365.347.01 1.814 3.815 3.913 7.093 3.913h.857v-2.244l-.454.033c-2.772.2-6.62-1.532-7.48-3.367-.491-1.049-.13-2.298.662-2.298.087 0 .18-.06.207-.133.194-.53.943-1.352 1.674-1.836.638-.447.642-.449 1.537-.862a10.8 10.8 0 012.614-.846c.37-.07.69-.151.71-.183.147-.22 2.962.146 4.036.527l.613.217.093-.127.093-.127 1.994-.006c2.419-.007 2.597-.053 4.124-1.062l.616-.407-.04-.346-.038-.346.372-.355c1.114-1.065 1.632-1.264 2.342-.902.205.105 1.669.925 3.251 1.821 3.111 1.763 3.057 1.72 3.064 2.373.005.465-.026.508-.807 1.125-.785.62-.923.68-1.443.62l-.352-.039-.307.247c-.523.42-1.574 1.02-2.165 1.235l-.565.205h-1.969c-2.336.002-2.383.018-3.06 1.005l-.168.246.242.453.242.454-.05.383c-.085.633-.141.696-.827.919-.825.268-1.602.635-1.709.806-.074.12-.774.47-.937.47-.187 0-.9.382-.872.467.011.034 1.195 1.356 2.63 2.937l2.61 2.874.286-.162c.158-.088.305-.22.328-.292.1-.316 1.014-.471 1.524-.258.465.194.794.15 1.08-.144.438-.453.601-.427 1.85.294l.74.427.81-.429c1.712-.906 2.593-1.477 2.512-1.629-.27-.505-.06-.831.95-1.476l.798-.508.358.035c.55.055 6.037 3.173 6.15 3.495.21.604.04.858-1.021 1.523l-.682.428-.379-.03a2.433 2.433 0 01-.606-.127l-.227-.096-.733.462c-2.79 1.76-4.27 2.357-4.892 1.978-.32-.195-.37-.19-.427.038-.026.104-.08.19-.121.19-.041 0-.075.18-.075.403 0 .518.013.507-1.812 1.573-1.27.742-1.513.858-1.78.848-.17-.006-.433.02-.585.06-.236.06-.368.034-.909-.184l-.632-.255-.09.34c-.345 1.312-1.54 2.557-2.75 2.864-1.32.335-3.886-.41-4.914-1.426l-.327-.324.033-.34c.067-.693.275-.993 1.091-1.573 1.083-.771 1.427-1.278 1.617-2.385.152-.89.623-1.647 1.024-1.647.08 0 .112-.081.111-.284v-.284l-2.69-2.953c-1.479-1.625-2.73-2.943-2.781-2.93-.14.035-1.922 1.16-2.15 1.357-.11.095-.Line truncated
></path>
/>
</g>
</svg>
);
@@ -16,7 +16,7 @@ export function UpperArmIcon({
<path
transform={flipped ? undefined : 'scale(-1,1) translate(-50,0)'}
d="M47.625 12.219c-.171-.137-8.614-8.622-8.918-8.926a.999.999 0 0 0-1.414 0c-1.996 1.996-4.216 8.745-4.291 15.364-2.309 3.104-2.842 7.479-2.965 9.393-3.187.334-5.254 2.287-6.943 3.884-.81.765-1.573 1.486-2.359 1.96-1.967 1.183-4.493 2.413-5.596 2.937a14.019 14.019 0 0 0-1.657-1.082c-.947-.52-2.496-.683-3.151-.73l-3.092-1.816A1.478 1.478 0 0 0 6.5 33 1.5 1.5 0 0 0 5 34.5c0 .35.082.689.629 1.236.597.597 1.101 1.14 2.976 3.014l-2.907 2.258H2a.998.998 0 0 0-.97 1.242l1 2.992a1 1 0 0 0 .651.706l2.973 1a1.015 1.015 0 0 0 .483.038l6.027-1a.988.988 0 0 0 .436-.187l3.946-2.959c.428-.233 3.692-1.952 8.755-2.856 5.89-1.052 9.31-2.796 10.608-3.565.058-.018.116-.033.176-.051.684-.192 1.716-.483 2.495-2.046.334-.669.54-1.318.74-1.947.325-1.022.605-1.906 1.378-2.659C46.089 24.46 48 20.085 48 13a.997.997 0 0 0-.375-.781z"
></path>
/>
</svg>
);
}
@@ -7,7 +7,7 @@ export function UpperChestIcon({ width = 24 }: { width?: number }) {
width={width}
viewBox="0 0 50 50"
>
<path d="M 20 2 C 18.156 2 16.700141 3.1345312 15.619141 4.0195312 C 12.698141 4.2755313 4 7.245 4 15 C 4 17.305 4.551 19.068203 4.875 19.908203 C 4.262 20.969203 3 23.679 3 28 C 3 28.352 3.184375 28.677422 3.484375 28.857422 L 8.484375 31.857422 C 8.835375 32.068422 9.2804219 32.044922 9.6074219 31.794922 C 10.290422 31.270922 10.833578 30.512578 11.267578 29.642578 C 11.118578 28.880578 11 28.05 11 27 L 11 21 C 11 20.448 11.448 20 12 20 C 12.43 20 12.790641 20.27425 12.931641 20.65625 C 12.944641 20.68425 12.982 20.797656 13 20.847656 C 13.197 21.404656 14.365 24 19 24 C 23.133 24 23.984531 19.976687 24.019531 19.804688 C 24.113531 19.329687 24.535 19.018531 25 19.019531 C 25.465 19.019531 25.886469 19.330687 25.980469 19.804688 C 26.015469 19.976687 26.867 24 31 24 C 35.635 24 36.803 21.405656 37 20.847656 C 37.018 20.797656 37.055359 20.68425 37.068359 20.65625 C 37.209359 20.27525 37.57 20 38 20 C 38.552 20 39 20.448 39 21 L 39 27 C 39 28.05 38.881422 28.881578 38.732422 29.642578 C 39.166422 30.513578 39.709578 31.269969 40.392578 31.792969 C 40.719578 32.042969 41.164625 32.066469 41.515625 31.855469 L 46.515625 28.855469 C 46.815625 28.676469 47 28.352 47 28 C 47 23.679 45.738 20.969203 45.125 19.908203 C 45.449 19.068203 46 17.305 46 15 C 46 7.245 37.301859 4.2755312 34.380859 4.0195312 C 33.299859 3.1345312 31.844 2 30 2 L 25 2 L 20 2 z M 25 22.609375 C 23.953 24.323375 22.059 26 19 26 C 16.075 26 14.195 25.130766 13 24.134766 L 13 27 C 13 28.281 13.194875 29.155016 13.421875 30.166016 C 13.692875 31.375016 14 32.746 14 35 C 14 35.027 13.987375 35.049172 13.984375 35.076172 C 13.994375 35.366172 14 35.669 14 36 L 14 42 C 14 44.997 18.628641 47.438484 19.556641 47.896484 C 19.693641 47.965484 19.847 48 20 48 L 25 48 L 30 48 C 30.153 48 30.306359 47.965484 30.443359 47.896484 C 31.371359 47.438484 36 44.997 36 42 L 36 36 C 36 35.669 36.005625 35.366172 36.015625 35.076172 C 36.012625 35.049172 36 35.027 36 35 C 36 32.746 36.307125 31.375016 36.578125 30.166016 C 36.805125 29.155016 37 28.281 37 27 L 37 24.134766 C 35.805 25.130766 33.925 26 31 26 C 27.941 26 26.047 24.323375 25 22.609375 z"></path>
<path d="M 20 2 C 18.156 2 16.700141 3.1345312 15.619141 4.0195312 C 12.698141 4.2755313 4 7.245 4 15 C 4 17.305 4.551 19.068203 4.875 19.908203 C 4.262 20.969203 3 23.679 3 28 C 3 28.352 3.184375 28.677422 3.484375 28.857422 L 8.484375 31.857422 C 8.835375 32.068422 9.2804219 32.044922 9.6074219 31.794922 C 10.290422 31.270922 10.833578 30.512578 11.267578 29.642578 C 11.118578 28.880578 11 28.05 11 27 L 11 21 C 11 20.448 11.448 20 12 20 C 12.43 20 12.790641 20.27425 12.931641 20.65625 C 12.944641 20.68425 12.982 20.797656 13 20.847656 C 13.197 21.404656 14.365 24 19 24 C 23.133 24 23.984531 19.976687 24.019531 19.804688 C 24.113531 19.329687 24.535 19.018531 25 19.019531 C 25.465 19.019531 25.886469 19.330687 25.980469 19.804688 C 26.015469 19.976687 26.867 24 31 24 C 35.635 24 36.803 21.405656 37 20.847656 C 37.018 20.797656 37.055359 20.68425 37.068359 20.65625 C 37.209359 20.27525 37.57 20 38 20 C 38.552 20 39 20.448 39 21 L 39 27 C 39 28.05 38.881422 28.881578 38.732422 29.642578 C 39.166422 30.513578 39.709578 31.269969 40.392578 31.792969 C 40.719578 32.042969 41.164625 32.066469 41.515625 31.855469 L 46.515625 28.855469 C 46.815625 28.676469 47 28.352 47 28 C 47 23.679 45.738 20.969203 45.125 19.908203 C 45.449 19.068203 46 17.305 46 15 C 46 7.245 37.301859 4.2755312 34.380859 4.0195312 C 33.299859 3.1345312 31.844 2 30 2 L 25 2 L 20 2 z M 25 22.609375 C 23.953 24.323375 22.059 26 19 26 C 16.075 26 14.195 25.130766 13 24.134766 L 13 27 C 13 28.281 13.194875 29.155016 13.421875 30.166016 C 13.692875 31.375016 14 32.746 14 35 C 14 35.027 13.987375 35.049172 13.984375 35.076172 C 13.994375 35.366172 14 35.669 14 36 L 14 42 C 14 44.997 18.628641 47.438484 19.556641 47.896484 C 19.693641 47.965484 19.847 48 20 48 L 25 48 L 30 48 C 30.153 48 30.306359 47.965484 30.443359 47.896484 C 31.371359 47.438484 36 44.997 36 42 L 36 36 C 36 35.669 36.005625 35.366172 36.015625 35.076172 C 36.012625 35.049172 36 35.027 36 35 C 36 32.746 36.307125 31.375016 36.578125 30.166016 C 36.805125 29.155016 37 28.281 37 27 L 37 24.134766 C 35.805 25.130766 33.925 26 31 26 C 27.941 26 26.047 24.323375 25 22.609375 z" />
</svg>
);
}
@@ -16,7 +16,7 @@ export function UpperLegIcon({
<path
transform={flipped ? 'scale(-1,1) translate(-50,0)' : undefined}
d="M42.727.059a.998.998 0 0 0-.774.043A1.042 1.042 0 0 0 41.516 0H24.313c-.04 0-.079.016-.118.02a.972.972 0 0 0-.8.238c-2.407 2.172-5.836 7.715-6.793 11.773-2.012 2.281-2.11 4.774-.313 7.828.617 1.043.746 2.262.895 3.676.086.8.171 1.625.355 2.492.29 1.325.883 2.637 1.453 3.907.32.707.621 1.37.863 2.02.29.78.618 1.605.95 2.437.797 2.004 1.789 4.5 2.144 6.28.082 1.087-.012 2-.367 2.638-1.227 2.18-2.941 1.793-4.988 2.664-2.153.922-3.508 1.32-4.32 1.472-2.07.387-1.864.57-1.864.934 0 .113.016.219.035.324.168.766.922 1.3 1.77 1.3.156 0 .32-.015.48-.038a3.2 3.2 0 0 0 1.086-.352c.09.063.188.102.285.149.493.234 1.028.27 1.618.27 2.011 0 3.293-.063 4.207-.15 1.511-.14 2.02-.331 3.074-.378.152-.008.316-.012.504-.012.898 0 2.734.54 4.84.54.562 0 1.02-.114 1.394-.298 1.024-.496 1.399-1.543 1.399-2.48 0-1.566-1.063-2.547-2.04-5.121-.44-1.328-.91-3.035-1.253-5.418-.047-.344-.075-.668-.106-.996l-.047-.602c-.164-2.992.45-5.394.965-7.37.43-1.653.8-3.083.594-4.4-.473-3.015-1.781-4.863-2.563-5.964-.148-.207-.32-.453-.414-.61.223-.484 1.043-1.53 2.39-2.168 2.15-1.015 11.349-6.57 13.712-13.27A1.007 1.007 0 0 0 42.727.06Z"
></path>
/>
</svg>
);
}
@@ -7,7 +7,7 @@ export function WaistIcon({ width = 24 }: { width?: number }) {
width={width}
viewBox="0 0 72 72"
>
<path d="M17 2c-.3 0-.6.2-.8.4-.2.3-.3.7-.2 1 2.9 7.1 3.1 15.3.6 22.4-.6 2-1.5 3.9-2.4 5.7-.1.2-.2.5-.3.7 13.2 4.2 26.7 4.1 40.2-.1-.6-1.4-1.9-3.9-2.7-6.3-2.5-7.1-2.3-15.3.6-22.4.1-.3.1-.7-.1-.9-.2-.3-.5-.5-.9-.5H17zM9.863 14.75a.944.944 0 0 0-.664.35c-.4.4-.298 1.1.102 1.4l2.1 1.8H3.9c-.5.1-1 .6-1 1.1 0 .6.4 1 1 1h7.5l-2.1 1.8c-.4.4-.502 1-.102 1.4.4.4 1 .5 1.4.1 1.6-1.3 4.002-3.4 4.202-3.6.4-.4.5-1 0-1.5-.2-.2-3.201-2.7-4.201-3.6a.908.908 0 0 0-.737-.25zm48.237.1a.846.846 0 0 0-.7.25c-1 .9-3.9 3.3-4.2 3.6-.4.4-.4 1.1 0 1.5.2.2 3.2 2.7 4.2 3.6.4.4 1 .3 1.4-.1.4-.4.3-1.1-.1-1.4l-2.1-1.8h7.5c.6 0 1-.4 1-1s-.4-1-1-1h-7.5l2.1-1.8c.4-.4.4-1.1.1-1.5-.2-.2-.45-.325-.7-.35zm-3 19.45c-14.2 4.6-28.4 4.6-42.2.1-.5 1.1-1 2.3-1.4 3.5-.1.4-.3.8-.4 1.2 8.4 1.7 15.9 7 22.1 15.8 6.4-9.3 14.5-14.8 23.6-16.1l-.3-.9c-.4-1.2-.9-2.4-1.4-3.6zm2.3 6.8c-8.9 1.2-16.8 6.8-23 16.3V66h17.5c.3 0 .6-.2.8-.4 4.8-7.1 6.5-16.2 4.7-24.5zm-46.8.2c-1.7 8.3 0 17.3 4.7 24.3.2.3.5.4.8.4h16.2v-8.4s0-.1-.1-.1c-6-9.2-13.3-14.6-21.6-16.2z"></path>
<path d="M17 2c-.3 0-.6.2-.8.4-.2.3-.3.7-.2 1 2.9 7.1 3.1 15.3.6 22.4-.6 2-1.5 3.9-2.4 5.7-.1.2-.2.5-.3.7 13.2 4.2 26.7 4.1 40.2-.1-.6-1.4-1.9-3.9-2.7-6.3-2.5-7.1-2.3-15.3.6-22.4.1-.3.1-.7-.1-.9-.2-.3-.5-.5-.9-.5H17zM9.863 14.75a.944.944 0 0 0-.664.35c-.4.4-.298 1.1.102 1.4l2.1 1.8H3.9c-.5.1-1 .6-1 1.1 0 .6.4 1 1 1h7.5l-2.1 1.8c-.4.4-.502 1-.102 1.4.4.4 1 .5 1.4.1 1.6-1.3 4.002-3.4 4.202-3.6.4-.4.5-1 0-1.5-.2-.2-3.201-2.7-4.201-3.6a.908.908 0 0 0-.737-.25zm48.237.1a.846.846 0 0 0-.7.25c-1 .9-3.9 3.3-4.2 3.6-.4.4-.4 1.1 0 1.5.2.2 3.2 2.7 4.2 3.6.4.4 1 .3 1.4-.1.4-.4.3-1.1-.1-1.4l-2.1-1.8h7.5c.6 0 1-.4 1-1s-.4-1-1-1h-7.5l2.1-1.8c.4-.4.4-1.1.1-1.5-.2-.2-.45-.325-.7-.35zm-3 19.45c-14.2 4.6-28.4 4.6-42.2.1-.5 1.1-1 2.3-1.4 3.5-.1.4-.3.8-.4 1.2 8.4 1.7 15.9 7 22.1 15.8 6.4-9.3 14.5-14.8 23.6-16.1l-.3-.9c-.4-1.2-.9-2.4-1.4-3.6zm2.3 6.8c-8.9 1.2-16.8 6.8-23 16.3V66h17.5c.3 0 .6-.2.8-.4 4.8-7.1 6.5-16.2 4.7-24.5zm-46.8.2c-1.7 8.3 0 17.3 4.7 24.3.2.3.5.4.8.4h16.2v-8.4s0-.1-.1-.1c-6-9.2-13.3-14.6-21.6-16.2z" />
</svg>
);
}
@@ -1,12 +1,12 @@
export function WarningIcon(props: any) {
export function WarningIcon({ width, className, ...props }: any) {
return (
<svg
xmlns="http://www.w3.org/2000/svg"
viewBox="0 0 20 20"
fill="currentColor"
{...props}
width={props.width || 30}
className={`${props.className || ''}`}
width={width || 30}
className={`${className || ''}`}
>
<path
fillRule="evenodd"
+1 -1
View File
@@ -21,7 +21,7 @@ export function WifiIcon({
const y = useMemo(() => (1 - percent) * 13, [percent]);
const col = useMemo(() => {
const colorsMap: { [key: number]: string } = {
const colorsMap: Record<number, string> = {
0.4: 'fill-status-success',
0.2: 'fill-status-warning',
0: 'fill-status-critical',
@@ -30,7 +30,7 @@ function IMUCard({
}: {
imuTypes: Imudto[];
hasIntPin: boolean;
control: Control<{ imus: CreateImuConfigDTO[] }, any>;
control: Control<{ imus: CreateImuConfigDTO[] }>;
index: number;
onDelete: () => void;
}) {
@@ -50,7 +50,7 @@ function IMUCard({
<div className={'w-full flex flex-col gap-2'}>
<div className="grid xs-settings:grid-cols-2 mobile-settings:grid-cols-1 gap-3 fill-background-10">
<label className="flex flex-col justify-end gap-1">
<Localized id="firmware_tool-add_imus_step-imu_type-label"></Localized>
<Localized id="firmware_tool-add_imus_step-imu_type-label" />
<Dropdown
control={control}
name={`imus[${index}].type`}
@@ -65,7 +65,7 @@ function IMUCard({
)}
direction="down"
display="block"
></Dropdown>
/>
</label>
<Localized
id="firmware_tool-add_imus_step-imu_rotation"
@@ -82,7 +82,7 @@ function IMUCard({
label="Rotation Degree"
placeholder="Rotation Degree"
autocomplete="off"
></Input>
/>
</Localized>
</div>
<div
@@ -104,7 +104,7 @@ function IMUCard({
name={`imus[${index}].sclPin`}
variant="primary"
autocomplete="off"
></Input>
/>
</Localized>
<Localized
id="firmware_tool-add_imus_step-sda_pin"
@@ -119,7 +119,7 @@ function IMUCard({
label="SDA Pin"
placeholder="SDA Pin"
autocomplete="off"
></Input>
/>
</Localized>
{hasIntPin && (
@@ -134,7 +134,7 @@ function IMUCard({
name={`imus[${index}].intPin`}
variant="primary"
autocomplete="off"
></Input>
/>
</Localized>
)}
<label className="flex flex-col justify-end gap-1 md:pt-3 sm:pt-3">
@@ -148,7 +148,7 @@ function IMUCard({
variant="toggle"
color="tertiary"
label=""
></CheckBox>
/>
</Localized>
</label>
</div>
@@ -156,7 +156,7 @@ function IMUCard({
</div>
<div className="flex flex-col items-center mt-[25px] fill-background-10">
<Button variant="quaternary" rounded onClick={onDelete}>
<TrashIcon size={15}></TrashIcon>
<TrashIcon size={15} />
</Button>
</div>
</div>
@@ -171,8 +171,8 @@ function IMUCard({
: 'firmware_tool-add_imus_step-show_more'
)}
</Typography>
{!open && <ArrowDownIcon></ArrowDownIcon>}
{open && <ArrowUpIcon></ArrowUpIcon>}
{!open && <ArrowDownIcon />}
{open && <ArrowUpIcon />}
</div>
</div>
);
@@ -237,72 +237,71 @@ export function AddImusStep({
};
return (
<>
<div className="flex flex-col w-full">
<div className="flex flex-col gap-4">
<Typography color="secondary">
{l10n.getString('firmware_tool-add_imus_step-description')}
</Typography>
</div>
<div className="my-4 flex flex-col gap-4">
{!isAckchuallyLoading && imuTypes && newConfig && (
<>
<div className="flex flex-col gap-3">
<div
className={classNames(
'grid gap-2 px-2',
form.imus.length > 1
? 'md:grid-cols-2 mobile-settings:grid-cols-1'
: 'grid-cols-1'
)}
>
{form.imus.map((imu, index) => (
<IMUCard
control={control}
imuTypes={imuTypes}
key={`${index}:${imu.type}`}
hasIntPin={
imuTypes?.find(({ type: t }) => t == imu.type)
?.hasIntPin ?? false
}
index={index}
onDelete={() => deleteImu(index)}
></IMUCard>
))}
</div>
<div className="flex justify-center">
<Localized id="firmware_tool-add_imus_step-add_more">
<Button variant="primary" onClick={addImu}></Button>
</Localized>
</div>
<div className="flex flex-col w-full">
<div className="flex flex-col gap-4">
<Typography color="secondary">
{l10n.getString('firmware_tool-add_imus_step-description')}
</Typography>
</div>
<div className="my-4 flex flex-col gap-4">
{!isAckchuallyLoading && imuTypes && newConfig && (
<>
<div className="flex flex-col gap-3">
<div
className={classNames(
'grid gap-2 px-2',
form.imus.length > 1
? 'md:grid-cols-2 mobile-settings:grid-cols-1'
: 'grid-cols-1'
)}
>
{form.imus.map((imu, index) => (
<IMUCard
control={control}
imuTypes={imuTypes}
// eslint-disable-next-line react/no-array-index-key
key={`${index}:${imu.type}`}
hasIntPin={
imuTypes?.find(({ type: t }) => t == imu.type)
?.hasIntPin ?? false
}
index={index}
onDelete={() => deleteImu(index)}
/>
))}
</div>
<div className="flex justify-between">
<Localized id="firmware_tool-previous_step">
<Button variant="tertiary" onClick={prevStep}></Button>
</Localized>
<Localized id="firmware_tool-next_step">
<Button
variant="primary"
disabled={!isValidState || form.imus.length === 0}
onClick={() => {
updateImus(form.imus);
nextStep();
}}
></Button>
<div className="flex justify-center">
<Localized id="firmware_tool-add_imus_step-add_more">
<Button variant="primary" onClick={addImu} />
</Localized>
</div>
</>
)}
{isAckchuallyLoading && (
<div className="flex justify-center flex-col items-center gap-3 h-44">
<LoaderIcon slimeState={SlimeState.JUMPY}></LoaderIcon>
<Localized id="firmware_tool-loading">
<Typography color="secondary"></Typography>
</div>
<div className="flex justify-between">
<Localized id="firmware_tool-previous_step">
<Button variant="tertiary" onClick={prevStep} />
</Localized>
<Localized id="firmware_tool-next_step">
<Button
variant="primary"
disabled={!isValidState || form.imus.length === 0}
onClick={() => {
updateImus(form.imus);
nextStep();
}}
/>
</Localized>
</div>
)}
</div>
</>
)}
{isAckchuallyLoading && (
<div className="flex justify-center flex-col items-center gap-3 h-44">
<LoaderIcon slimeState={SlimeState.JUMPY} />
<Localized id="firmware_tool-loading">
<Typography color="secondary" />
</Localized>
</div>
)}
</div>
</>
</div>
);
}
+137 -139
View File
@@ -50,149 +50,147 @@ export function BoardPinsStep({
}, [defaultConfig]);
return (
<>
<div className="flex flex-col w-full justify-between text-background-10">
<div className="flex flex-col gap-4">
<Typography color="secondary">
{l10n.getString('firmware_tool-board_pins_step-description')}
</Typography>
</div>
<div className="my-4 p-2">
{!isLoading && !isFetching && batteryTypes && (
<form className="flex flex-col gap-2">
<div className="grid xs-settings:grid-cols-2 mobile-settings:grid-cols-1 gap-2">
<label className="flex flex-col justify-end">
{/* Allows to have the right spacing at the top of the checkbox */}
<CheckBox
control={control}
color="tertiary"
name="enableLed"
variant="toggle"
outlined
label={l10n.getString(
'firmware_tool-board_pins_step-enable_led'
)}
></CheckBox>
</label>
<Localized
id="firmware_tool-board_pins_step-led_pin"
attrs={{ placeholder: true, label: true }}
>
<Input
control={control}
rules={{ required: true }}
type="text"
name="ledPin"
variant="secondary"
disabled={!ledEnabled}
></Input>
</Localized>
</div>
<div
className={classNames(
batteryType === 'BAT_EXTERNAL' &&
'bg-background-80 p-2 rounded-md',
'transition-all duration-500 flex-col flex gap-2'
)}
>
<Dropdown
<div className="flex flex-col w-full justify-between text-background-10">
<div className="flex flex-col gap-4">
<Typography color="secondary">
{l10n.getString('firmware_tool-board_pins_step-description')}
</Typography>
</div>
<div className="my-4 p-2">
{!isLoading && !isFetching && batteryTypes && (
<form className="flex flex-col gap-2">
<div className="grid xs-settings:grid-cols-2 mobile-settings:grid-cols-1 gap-2">
<label className="flex flex-col justify-end">
{/* Allows to have the right spacing at the top of the checkbox */}
<CheckBox
control={control}
name="batteryType"
variant="primary"
placeholder={l10n.getString(
'firmware_tool-board_pins_step-battery_type'
color="tertiary"
name="enableLed"
variant="toggle"
outlined
label={l10n.getString(
'firmware_tool-board_pins_step-enable_led'
)}
direction="up"
display="block"
items={batteryTypes.map((battery) => ({
label: l10n.getString(
'firmware_tool-board_pins_step-battery_type-' + battery
),
value: battery,
}))}
></Dropdown>
{batteryType === 'BAT_EXTERNAL' && (
<div className="grid grid-cols-2 gap-2">
<Localized
id="firmware_tool-board_pins_step-battery_sensor_pin"
attrs={{ placeholder: true, label: true }}
>
<Input
control={control}
rules={{ required: true }}
type="text"
name="batteryPin"
variant="secondary"
></Input>
</Localized>
<Localized
id="firmware_tool-board_pins_step-battery_resistor"
attrs={{ placeholder: true, label: true }}
>
<Input
control={control}
rules={{ required: true, min: 0 }}
type="number"
name="batteryResistances[0]"
variant="secondary"
label="Battery Resistor"
placeholder="Battery Resistor"
></Input>
</Localized>
<Localized
id="firmware_tool-board_pins_step-battery_shield_resistor-0"
attrs={{ placeholder: true, label: true }}
>
<Input
control={control}
rules={{ required: true, min: 0 }}
type="number"
name="batteryResistances[1]"
variant="secondary"
></Input>
</Localized>
<Localized
id="firmware_tool-board_pins_step-battery_shield_resistor-1"
attrs={{ placeholder: true, label: true }}
>
<Input
control={control}
rules={{ required: true, min: 0 }}
type="number"
name="batteryResistances[2]"
variant="secondary"
></Input>
</Localized>
</div>
)}
</div>
</form>
)}
{(isLoading || isFetching) && (
<div className="flex justify-center flex-col items-center gap-3 h-44">
<LoaderIcon slimeState={SlimeState.JUMPY}></LoaderIcon>
<Localized id="firmware_tool-loading">
<Typography color="secondary"></Typography>
/>
</label>
<Localized
id="firmware_tool-board_pins_step-led_pin"
attrs={{ placeholder: true, label: true }}
>
<Input
control={control}
rules={{ required: true }}
type="text"
name="ledPin"
variant="secondary"
disabled={!ledEnabled}
/>
</Localized>
</div>
)}
</div>
<div className="flex justify-between">
<Localized id="firmware_tool-previous_step">
<Button variant="tertiary" onClick={prevStep}></Button>
</Localized>
<Localized id="firmware_tool-ok">
<Button
variant="primary"
disabled={Object.keys(formState.errors).length !== 0}
onClick={() => {
updatePins(formValue);
nextStep();
}}
></Button>
</Localized>
</div>
<div
className={classNames(
batteryType === 'BAT_EXTERNAL' &&
'bg-background-80 p-2 rounded-md',
'transition-all duration-500 flex-col flex gap-2'
)}
>
<Dropdown
control={control}
name="batteryType"
variant="primary"
placeholder={l10n.getString(
'firmware_tool-board_pins_step-battery_type'
)}
direction="up"
display="block"
items={batteryTypes.map((battery) => ({
label: l10n.getString(
`firmware_tool-board_pins_step-battery_type-${battery}`
),
value: battery,
}))}
/>
{batteryType === 'BAT_EXTERNAL' && (
<div className="grid grid-cols-2 gap-2">
<Localized
id="firmware_tool-board_pins_step-battery_sensor_pin"
attrs={{ placeholder: true, label: true }}
>
<Input
control={control}
rules={{ required: true }}
type="text"
name="batteryPin"
variant="secondary"
/>
</Localized>
<Localized
id="firmware_tool-board_pins_step-battery_resistor"
attrs={{ placeholder: true, label: true }}
>
<Input
control={control}
rules={{ required: true, min: 0 }}
type="number"
name="batteryResistances[0]"
variant="secondary"
label="Battery Resistor"
placeholder="Battery Resistor"
/>
</Localized>
<Localized
id="firmware_tool-board_pins_step-battery_shield_resistor-0"
attrs={{ placeholder: true, label: true }}
>
<Input
control={control}
rules={{ required: true, min: 0 }}
type="number"
name="batteryResistances[1]"
variant="secondary"
/>
</Localized>
<Localized
id="firmware_tool-board_pins_step-battery_shield_resistor-1"
attrs={{ placeholder: true, label: true }}
>
<Input
control={control}
rules={{ required: true, min: 0 }}
type="number"
name="batteryResistances[2]"
variant="secondary"
/>
</Localized>
</div>
)}
</div>
</form>
)}
{(isLoading || isFetching) && (
<div className="flex justify-center flex-col items-center gap-3 h-44">
<LoaderIcon slimeState={SlimeState.JUMPY} />
<Localized id="firmware_tool-loading">
<Typography color="secondary" />
</Localized>
</div>
)}
</div>
</>
<div className="flex justify-between">
<Localized id="firmware_tool-previous_step">
<Button variant="tertiary" onClick={prevStep} />
</Localized>
<Localized id="firmware_tool-ok">
<Button
variant="primary"
disabled={Object.keys(formState.errors).length !== 0}
onClick={() => {
updatePins(formValue);
nextStep();
}}
/>
</Localized>
</div>
</div>
);
}
+41 -42
View File
@@ -10,6 +10,7 @@ import {
import { useEffect, useMemo } from 'react';
import { firmwareToolBaseUrl } from '@/firmware-tool-api/firmwareToolFetcher';
import { Button } from '@/components/commons/Button';
import { error } from '@/utils/logging';
export function BuildStep({
isActive,
@@ -42,7 +43,7 @@ export function BuildStep({
};
}
} catch (e) {
console.error(e);
error(e);
setBuildStatus({ id: '', status: 'ERROR' });
}
};
@@ -65,47 +66,45 @@ export function BuildStep({
);
return (
<>
<div className="flex flex-col w-full">
<div className="flex flex-grow flex-col gap-4">
<Typography color="secondary">
{l10n.getString('firmware_tool-build_step-description')}
</Typography>
</div>
<div className="my-4">
{!isGlobalLoading && (
<div className="flex justify-center flex-col items-center gap-3 h-44">
<LoaderIcon
slimeState={
buildStatus.status !== 'ERROR'
? SlimeState.JUMPY
: SlimeState.SAD
}
></LoaderIcon>
<Typography variant="section-title" color="secondary">
{l10n.getString('firmware_tool-build-' + buildStatus.status)}
</Typography>
</div>
)}
{isGlobalLoading && (
<div className="flex justify-center flex-col items-center gap-3 h-44">
<LoaderIcon slimeState={SlimeState.JUMPY}></LoaderIcon>
<Localized id="firmware_tool-loading">
<Typography color="secondary"></Typography>
</Localized>
</div>
)}
</div>
<div className="flex justify-end">
<Localized id="firmware_tool-retry">
<Button
variant="secondary"
disabled={hasPendingBuild}
onClick={() => goTo('FlashingMethod')}
></Button>
</Localized>
</div>
<div className="flex flex-col w-full">
<div className="flex flex-grow flex-col gap-4">
<Typography color="secondary">
{l10n.getString('firmware_tool-build_step-description')}
</Typography>
</div>
</>
<div className="my-4">
{!isGlobalLoading && (
<div className="flex justify-center flex-col items-center gap-3 h-44">
<LoaderIcon
slimeState={
buildStatus.status !== 'ERROR'
? SlimeState.JUMPY
: SlimeState.SAD
}
/>
<Typography variant="section-title" color="secondary">
{l10n.getString(`firmware_tool-build-${buildStatus.status}`)}
</Typography>
</div>
)}
{isGlobalLoading && (
<div className="flex justify-center flex-col items-center gap-3 h-44">
<LoaderIcon slimeState={SlimeState.JUMPY} />
<Localized id="firmware_tool-loading">
<Typography color="secondary" />
</Localized>
</div>
)}
</div>
<div className="flex justify-end">
<Localized id="firmware_tool-retry">
<Button
variant="secondary"
disabled={hasPendingBuild}
onClick={() => goTo('FlashingMethod')}
/>
</Localized>
</div>
</div>
);
}
@@ -98,18 +98,18 @@ export function DeviceCardControl({
checked={value || false}
type="checkbox"
disabled={disabled}
></input>
/>
</div>
<div className="w-full">
<DeviceCardContent {...props}></DeviceCardContent>
<DeviceCardContent {...props} />
</div>
</label>
)}
></Controller>
/>
) : (
<div className="px-2 h-full">
<DeviceCardContent {...props}></DeviceCardContent>
<DeviceCardContent {...props} />
</div>
)}
<div
@@ -126,7 +126,7 @@ export function DeviceCardControl({
bottom
height={6}
colorClass="bg-accent-background-20"
></ProgressBar>
/>
</div>
{online !== null && (
<div className="absolute top-2 right-2">
@@ -134,7 +134,7 @@ export function DeviceCardControl({
status={
online ? TrackerStatusEnum.OK : TrackerStatusEnum.DISCONNECTED
}
></TrackerStatus>
/>
</div>
)}
</div>
@@ -5,19 +5,19 @@ import {
FirmwareToolContextC,
useFirmwareToolContext,
} from '@/hooks/firmware-tool';
import { AddImusStep } from './AddImusStep';
import { SelectBoardStep } from './SelectBoardStep';
import { BoardPinsStep } from './BoardPinsStep';
import VerticalStepper from '@/components/commons/VerticalStepper';
import { LoaderIcon, SlimeState } from '@/components/commons/icon/LoaderIcon';
import { Button } from '@/components/commons/Button';
import { FirmwareUpdateMethod } from 'solarxr-protocol';
import { useMemo } from 'react';
import { AddImusStep } from './AddImusStep';
import { SelectBoardStep } from './SelectBoardStep';
import { BoardPinsStep } from './BoardPinsStep';
import { SelectFirmwareStep } from './SelectFirmwareStep';
import { BuildStep } from './BuildStep';
import { FlashingMethodStep } from './FlashingMethodStep';
import { FlashingStep } from './FlashingStep';
import { FlashBtnStep } from './FlashBtnStep';
import { FirmwareUpdateMethod } from 'solarxr-protocol';
import { useMemo } from 'react';
function FirmwareToolContent() {
const { l10n } = useLocalization();
@@ -80,40 +80,39 @@ function FirmwareToolContent() {
{l10n.getString('firmware_tool')}
</Typography>
<div className="flex flex-col pt-2 pb-4">
<>
{l10n
.getString('firmware_tool-description')
.split('\n')
.map((line, i) => (
<Typography color="secondary" key={i}>
{line}
</Typography>
))}
</>
{l10n
.getString('firmware_tool-description')
.split('\n')
.map((line, i) => (
// eslint-disable-next-line react/no-array-index-key
<Typography color="secondary" key={i}>
{line}
</Typography>
))}
</div>
<div className="m-4 h-full">
{isError && (
<div className="w-full flex flex-col justify-center items-center gap-3 h-full">
<LoaderIcon slimeState={SlimeState.SAD}></LoaderIcon>
<LoaderIcon slimeState={SlimeState.SAD} />
{!isCompatible ? (
<Localized id="firmware_tool-not_compatible">
<Typography variant="section-title"></Typography>
<Typography variant="section-title" />
</Localized>
) : (
<Localized id="firmware_tool-not_available">
<Typography variant="section-title"></Typography>
<Typography variant="section-title" />
</Localized>
)}
<Localized id="firmware_tool-retry">
<Button variant="primary" onClick={retry}></Button>
<Button variant="primary" onClick={retry} />
</Localized>
</div>
)}
{isLoading && (
<div className="w-full flex flex-col justify-center items-center gap-3 h-full">
<LoaderIcon slimeState={SlimeState.JUMPY}></LoaderIcon>
<LoaderIcon slimeState={SlimeState.JUMPY} />
<Localized id="firmware_tool-loading">
<Typography variant="section-title"></Typography>
<Typography variant="section-title" />
</Localized>
</div>
)}
@@ -19,68 +19,64 @@ export function FlashBtnStep({
const { defaultConfig } = useFirmwareTool();
return (
<>
<div className="flex flex-col w-full">
<div className="flex flex-grow flex-col gap-4">
<Typography color="secondary">
{l10n.getString('firmware_tool-flashbtn_step-description')}
</Typography>
{defaultConfig?.boardConfig.type ===
boardTypeToFirmwareToolBoardType[BoardType.SLIMEVR] ? (
<>
<Typography variant="standard" whitespace="whitespace-pre">
{l10n.getString('firmware_tool-flashbtn_step-board_SLIMEVR')}
</Typography>
<div className="gap-2 grid lg:grid-cols-3 md:grid-cols-2 mobile:grid-cols-1">
<div className="bg-background-80 p-2 rounded-lg gap-2 flex flex-col justify-between">
<Typography variant="main-title">R11</Typography>
<Typography variant="standard">
{l10n.getString(
'firmware_tool-flashbtn_step-board_SLIMEVR-r11'
)}
</Typography>
<img src="/images/R11_board_reset.webp"></img>
</div>
<div className="bg-background-80 p-2 rounded-lg gap-2 flex flex-col justify-between">
<Typography variant="main-title">R12</Typography>
<Typography variant="standard">
{l10n.getString(
'firmware_tool-flashbtn_step-board_SLIMEVR-r12'
)}
</Typography>
<img src="/images/R12_board_reset.webp"></img>
</div>
<div className="bg-background-80 p-2 rounded-lg gap-2 flex flex-col justify-between">
<Typography variant="main-title">R14</Typography>
<Typography variant="standard">
{l10n.getString(
'firmware_tool-flashbtn_step-board_SLIMEVR-r14'
)}
</Typography>
<img src="/images/R14_board_reset_sw.webp"></img>
</div>
<div className="flex flex-col w-full">
<div className="flex flex-grow flex-col gap-4">
<Typography color="secondary">
{l10n.getString('firmware_tool-flashbtn_step-description')}
</Typography>
{defaultConfig?.boardConfig.type ===
boardTypeToFirmwareToolBoardType[BoardType.SLIMEVR] ? (
<>
<Typography variant="standard" whitespace="whitespace-pre">
{l10n.getString('firmware_tool-flashbtn_step-board_SLIMEVR')}
</Typography>
<div className="gap-2 grid lg:grid-cols-3 md:grid-cols-2 mobile:grid-cols-1">
<div className="bg-background-80 p-2 rounded-lg gap-2 flex flex-col justify-between">
<Typography variant="main-title">R11</Typography>
<Typography variant="standard">
{l10n.getString(
'firmware_tool-flashbtn_step-board_SLIMEVR-r11'
)}
</Typography>
<img src="/images/R11_board_reset.webp" />
</div>
</>
) : (
<>
<Typography variant="standard" whitespace="whitespace-pre">
{l10n.getString('firmware_tool-flashbtn_step-board_OTHER')}
</Typography>
</>
)}
<div className="flex justify-end">
<Localized id="firmware_tool-next_step">
<Button
variant="primary"
onClick={() => {
nextStep();
}}
></Button>
</Localized>
</div>
<div className="bg-background-80 p-2 rounded-lg gap-2 flex flex-col justify-between">
<Typography variant="main-title">R12</Typography>
<Typography variant="standard">
{l10n.getString(
'firmware_tool-flashbtn_step-board_SLIMEVR-r12'
)}
</Typography>
<img src="/images/R12_board_reset.webp" />
</div>
<div className="bg-background-80 p-2 rounded-lg gap-2 flex flex-col justify-between">
<Typography variant="main-title">R14</Typography>
<Typography variant="standard">
{l10n.getString(
'firmware_tool-flashbtn_step-board_SLIMEVR-r14'
)}
</Typography>
<img src="/images/R14_board_reset_sw.webp" />
</div>
</div>
</>
) : (
<Typography variant="standard" whitespace="whitespace-pre">
{l10n.getString('firmware_tool-flashbtn_step-board_OTHER')}
</Typography>
)}
<div className="flex justify-end">
<Localized id="firmware_tool-next_step">
<Button
variant="primary"
onClick={() => {
nextStep();
}}
/>
</Localized>
</div>
</div>
</>
</div>
);
}
@@ -26,11 +26,11 @@ import { Button } from '@/components/commons/Button';
import { Input } from '@/components/commons/Input';
import { Dropdown } from '@/components/commons/Dropdown';
import { useOnboarding } from '@/hooks/onboarding';
import { DeviceCardControl } from './DeviceCard';
import { getTrackerName } from '@/hooks/tracker';
import { ObjectSchema, object, string } from 'yup';
import { useAtomValue } from 'jotai';
import { devicesAtom } from '@/store/app-store';
import { DeviceCardControl } from './DeviceCard';
interface FlashingMethodForm {
flashingMethod?: string;
@@ -40,7 +40,7 @@ interface FlashingMethodForm {
password?: string;
};
ota?: {
selectedDevices: { [key: string]: boolean };
selectedDevices: Record<string, boolean>;
};
}
@@ -129,7 +129,7 @@ function SerialDevicesList({
return (
<>
<Localized id="firmware_tool-flash_method_serial-wifi">
<Typography variant="section-title"></Typography>
<Typography variant="section-title" />
</Localized>
<div className="grid xs-settings:grid-cols-2 mobile-settings:grid-cols-1 gap-3 text-background-10">
<Localized
@@ -156,11 +156,11 @@ function SerialDevicesList({
</Localized>
</div>
<Localized id="firmware_tool-flash_method_serial-devices-label">
<Typography variant="section-title"></Typography>
<Typography variant="section-title" />
</Localized>
{Object.keys(devices).length === 0 ? (
<Localized id="firmware_tool-flash_method_serial-no_devices">
<Typography variant="standard" color="secondary"></Typography>
<Typography variant="standard" color="secondary" />
</Localized>
) : (
<Dropdown
@@ -175,7 +175,7 @@ function SerialDevicesList({
)}
display="block"
direction="down"
></Dropdown>
/>
)}
</>
);
@@ -270,11 +270,11 @@ function OTADevicesList({
return (
<>
<Localized id="firmware_tool-flash_method_ota-devices">
<Typography variant="section-title"></Typography>
<Typography variant="section-title" />
</Localized>
{devices.length === 0 && (
<Localized id="firmware_tool-flash_method_ota-no_devices">
<Typography color="secondary"></Typography>
<Typography color="secondary" />
</Localized>
)}
<div className="grid xs-settings:grid-cols-2 mobile-settings:grid-cols-1 gap-2">
@@ -284,7 +284,7 @@ function OTADevicesList({
key={device.id?.id ?? 0}
name={`ota.selectedDevices.id-${device.id?.id ?? 0}`}
deviceNames={deviceNames(device)}
></DeviceCardControl>
/>
))}
</div>
</>
@@ -344,84 +344,78 @@ export function FlashingMethodStep({
const flashingMethod = watch('flashingMethod');
return (
<>
<div className="flex flex-col w-full">
<div className="flex flex-grow flex-col gap-4">
<Typography color="secondary">
{l10n.getString('firmware_tool-flash_method_step-description')}
</Typography>
</div>
<div className="my-4">
{!isGlobalLoading && (
<div className="flex flex-col gap-3">
<div className="grid xs-settings:grid-cols-2 mobile-settings:grid-cols-1 gap-3">
<Localized
id="firmware_tool-flash_method_step-ota"
attrs={{ label: true, description: true }}
>
<Radio
control={control}
name="flashingMethod"
value={FirmwareUpdateMethod.OTAFirmwareUpdate.toString()}
label=""
></Radio>
</Localized>
<Localized
id="firmware_tool-flash_method_step-serial"
attrs={{ label: true, description: true }}
>
<Radio
control={control}
name="flashingMethod"
value={FirmwareUpdateMethod.SerialFirmwareUpdate.toString()}
label=""
></Radio>
</Localized>
</div>
{flashingMethod ===
FirmwareUpdateMethod.SerialFirmwareUpdate.toString() && (
<SerialDevicesList
<div className="flex flex-col w-full">
<div className="flex flex-grow flex-col gap-4">
<Typography color="secondary">
{l10n.getString('firmware_tool-flash_method_step-description')}
</Typography>
</div>
<div className="my-4">
{!isGlobalLoading && (
<div className="flex flex-col gap-3">
<div className="grid xs-settings:grid-cols-2 mobile-settings:grid-cols-1 gap-3">
<Localized
id="firmware_tool-flash_method_step-ota"
attrs={{ label: true, description: true }}
>
<Radio
control={control}
watch={watch}
reset={reset}
></SerialDevicesList>
)}
{flashingMethod ===
FirmwareUpdateMethod.OTAFirmwareUpdate.toString() && (
<OTADevicesList
name="flashingMethod"
value={FirmwareUpdateMethod.OTAFirmwareUpdate.toString()}
label=""
/>
</Localized>
<Localized
id="firmware_tool-flash_method_step-serial"
attrs={{ label: true, description: true }}
>
<Radio
control={control}
watch={watch}
reset={reset}
></OTADevicesList>
)}
<div className="flex justify-between">
<Localized id="firmware_tool-previous_step">
<Button variant="secondary" onClick={prevStep}></Button>
</Localized>
<Localized id="firmware_tool-next_step">
<Button
variant="primary"
disabled={
!isValid ||
selectedDevices === null ||
selectedDevices.length === 0
}
onClick={nextStep}
></Button>
</Localized>
</div>
</div>
)}
{isGlobalLoading && (
<div className="flex justify-center flex-col items-center gap-3 h-44">
<LoaderIcon slimeState={SlimeState.JUMPY}></LoaderIcon>
<Localized id="firmware_tool-loading">
<Typography color="secondary"></Typography>
name="flashingMethod"
value={FirmwareUpdateMethod.SerialFirmwareUpdate.toString()}
label=""
/>
</Localized>
</div>
)}
</div>
{flashingMethod ===
FirmwareUpdateMethod.SerialFirmwareUpdate.toString() && (
<SerialDevicesList
control={control}
watch={watch}
reset={reset}
/>
)}
{flashingMethod ===
FirmwareUpdateMethod.OTAFirmwareUpdate.toString() && (
<OTADevicesList control={control} watch={watch} reset={reset} />
)}
<div className="flex justify-between">
<Localized id="firmware_tool-previous_step">
<Button variant="secondary" onClick={prevStep} />
</Localized>
<Localized id="firmware_tool-next_step">
<Button
variant="primary"
disabled={
!isValid ||
selectedDevices === null ||
selectedDevices.length === 0
}
onClick={nextStep}
/>
</Localized>
</div>
</div>
)}
{isGlobalLoading && (
<div className="flex justify-center flex-col items-center gap-3 h-44">
<LoaderIcon slimeState={SlimeState.JUMPY} />
<Localized id="firmware_tool-loading">
<Typography color="secondary" />
</Localized>
</div>
)}
</div>
</>
</div>
);
}
@@ -17,11 +17,11 @@ import {
RpcMessage,
} from 'solarxr-protocol';
import { useOnboarding } from '@/hooks/onboarding';
import { DeviceCardControl } from './DeviceCard';
import { WarningBox } from '@/components/commons/TipBox';
import { Button } from '@/components/commons/Button';
import { useNavigate } from 'react-router-dom';
import { firmwareToolS3BaseUrl } from '@/firmware-tool-api/firmwareToolFetcher';
import { DeviceCardControl } from './DeviceCard';
export function FlashingStep({
goTo,
@@ -38,14 +38,17 @@ export function FlashingStep({
useFirmwareTool();
const { state: onboardingState } = useOnboarding();
const { sendRPCPacket, useRPCPacket } = useWebsocketAPI();
const [status, setStatus] = useState<{
[key: string]: {
status: FirmwareUpdateStatus;
type: FirmwareUpdateMethod;
progress: number;
deviceNames: string[];
};
}>({});
const [status, setStatus] = useState<
Record<
string,
{
status: FirmwareUpdateStatus;
type: FirmwareUpdateMethod;
progress: number;
deviceNames: string[];
}
>
>({});
const clear = () => {
setStatus({});
@@ -161,60 +164,58 @@ export function FlashingStep({
);
return (
<>
<div className="flex flex-col w-full">
<div className="flex flex-grow flex-col gap-4">
<Typography color="secondary">
{l10n.getString('firmware_tool-flashing_step-description')}
</Typography>
</div>
<div className="flex flex-col w-full">
<div className="flex flex-grow flex-col gap-4">
<Typography color="secondary">
{l10n.getString('firmware_tool-flashing_step-description')}
</Typography>
</div>
<div className="my-4 flex gap-2 flex-col">
{shouldShowRebootWarning && (
<Localized id="firmware_tool-flashing_step-warning-v2">
<WarningBox>Warning</WarningBox>
</Localized>
)}
<div className="my-4 flex gap-2 flex-col">
{shouldShowRebootWarning && (
<Localized id="firmware_tool-flashing_step-warning-v2">
<WarningBox>Warning</WarningBox>
</Localized>
)}
{Object.keys(status).map((id) => {
const val = status[id];
{Object.keys(status).map((id) => {
const val = status[id];
return (
<DeviceCardControl
status={val.status}
progress={val.progress}
key={id}
deviceNames={val.deviceNames}
></DeviceCardControl>
);
})}
<div className="flex gap-2 self-end">
<Localized id="firmware_tool-retry">
<Button
variant="secondary"
disabled={trackerWithErrors.length === 0}
onClick={retryError}
></Button>
</Localized>
<Localized id="firmware_tool-flashing_step-flash_more">
<Button
variant="secondary"
disabled={hasPendingTrackers}
onClick={() => goTo('FlashingMethod')}
></Button>
</Localized>
<Localized id="firmware_tool-flashing_step-exit">
<Button
variant="primary"
onClick={() => {
clear();
nav('/');
}}
></Button>
</Localized>
</div>
return (
<DeviceCardControl
status={val.status}
progress={val.progress}
key={id}
deviceNames={val.deviceNames}
/>
);
})}
<div className="flex gap-2 self-end">
<Localized id="firmware_tool-retry">
<Button
variant="secondary"
disabled={trackerWithErrors.length === 0}
onClick={retryError}
/>
</Localized>
<Localized id="firmware_tool-flashing_step-flash_more">
<Button
variant="secondary"
disabled={hasPendingTrackers}
onClick={() => goTo('FlashingMethod')}
/>
</Localized>
<Localized id="firmware_tool-flashing_step-exit">
<Button
variant="primary"
onClick={() => {
clear();
nav('/');
}}
/>
</Localized>
</div>
</div>
</>
</div>
);
}
@@ -24,79 +24,77 @@ export function SelectBoardStep({
const { isFetching, data: boards } = useGetFirmwaresBoards({});
return (
<>
<div className="flex flex-col w-full">
<div className="flex flex-grow flex-col gap-4">
<Typography color="secondary">
{l10n.getString('firmware_tool-board_step-description')}
</Typography>
</div>
<div className="my-4">
{!isFetching && (
<div className="gap-2 flex flex-col">
<div className="grid sm:grid-cols-2 mobile-settings:grid-cols-1 gap-2">
{boards
?.filter(
(board) =>
!!firmwareToolToBoardType[
board as CreateBoardConfigDTO['type']
]
)
.map((board) => (
<div
key={board}
className={classNames(
'p-3 rounded-md hover:bg-background-50',
{
'bg-background-50 text-background-10':
newConfig?.boardConfig?.type === board,
'bg-background-60':
newConfig?.boardConfig?.type !== board,
}
)}
onClick={() => {
selectBoard(board as CreateBoardConfigDTO['type']);
}}
>
{l10n.getString(
`board_type-${
BoardType[
firmwareToolToBoardType[
board as CreateBoardConfigDTO['type']
] ?? BoardType.UNKNOWN
]
}`
)}
</div>
))}
</div>
<div className="flex justify-end">
<Localized id="firmware_tool-next_step">
<Button
variant="primary"
disabled={!newConfig?.boardConfig?.type}
onClick={() => {
if (defaultConfig?.shouldOnlyUseDefaults) {
goTo('SelectFirmware');
} else {
nextStep();
<div className="flex flex-col w-full">
<div className="flex flex-grow flex-col gap-4">
<Typography color="secondary">
{l10n.getString('firmware_tool-board_step-description')}
</Typography>
</div>
<div className="my-4">
{!isFetching && (
<div className="gap-2 flex flex-col">
<div className="grid sm:grid-cols-2 mobile-settings:grid-cols-1 gap-2">
{boards
?.filter(
(board) =>
!!firmwareToolToBoardType[
board as CreateBoardConfigDTO['type']
]
)
.map((board) => (
<div
key={board}
className={classNames(
'p-3 rounded-md hover:bg-background-50',
{
'bg-background-50 text-background-10':
newConfig?.boardConfig?.type === board,
'bg-background-60':
newConfig?.boardConfig?.type !== board,
}
)}
onClick={() => {
selectBoard(board as CreateBoardConfigDTO['type']);
}}
></Button>
</Localized>
</div>
>
{l10n.getString(
`board_type-${
BoardType[
firmwareToolToBoardType[
board as CreateBoardConfigDTO['type']
] ?? BoardType.UNKNOWN
]
}`
)}
</div>
))}
</div>
)}
{isFetching && (
<div className="flex justify-center flex-col items-center gap-3 h-44">
<LoaderIcon slimeState={SlimeState.JUMPY}></LoaderIcon>
<Localized id="firmware_tool-loading">
<Typography color="secondary"></Typography>
<div className="flex justify-end">
<Localized id="firmware_tool-next_step">
<Button
variant="primary"
disabled={!newConfig?.boardConfig?.type}
onClick={() => {
if (defaultConfig?.shouldOnlyUseDefaults) {
goTo('SelectFirmware');
} else {
nextStep();
}
}}
/>
</Localized>
</div>
)}
</div>
</div>
)}
{isFetching && (
<div className="flex justify-center flex-col items-center gap-3 h-44">
<LoaderIcon slimeState={SlimeState.JUMPY} />
<Localized id="firmware_tool-loading">
<Typography color="secondary" />
</Localized>
</div>
)}
</div>
</>
</div>
);
}
@@ -26,95 +26,94 @@ export function SelectFirmwareStep({
const showThirdParty = watch('thirdParty');
const getName = (name: string) => {
return showThirdParty ? name : name.substring(name.indexOf('/') + 1);
};
const getName = (name: string) =>
showThirdParty ? name : name.substring(name.indexOf('/') + 1);
const filteredFirmwares = useMemo(() => {
return firmwares?.filter(
({ name }) => name.split('/')[0] === 'SlimeVR' || showThirdParty
);
}, [firmwares, showThirdParty]);
const filteredFirmwares = useMemo(
() =>
firmwares?.filter(
({ name }) => name.split('/')[0] === 'SlimeVR' || showThirdParty
),
[firmwares, showThirdParty]
);
return (
<>
<div className="flex flex-col w-full">
<div className="flex justify-between items-center mobile:flex-col gap-4">
<Typography color="secondary">
{l10n.getString('firmware_tool-select_firmware_step-description')}
</Typography>
<div>
<Localized
id="firmware_tool-select_firmware_step-show-third-party"
attrs={{ label: true }}
>
<CheckBox
control={control}
name="thirdParty"
label="Show third party firmwares"
></CheckBox>
</Localized>
</div>
</div>
<div className="my-4">
{!isFetching && (
<div className="flex flex-col gap-4">
<div className="xs-settings:max-h-96 xs-settings:overflow-y-auto xs-settings:px-2">
<div className="grid sm:grid-cols-2 mobile-settings:grid-cols-1 gap-2">
{filteredFirmwares?.map((firmware) => (
<div
key={firmware.id}
className={classNames(
'p-3 rounded-md hover:bg-background-50',
{
'bg-background-50 text-background-10':
newConfig?.version === firmware.name,
'bg-background-60':
newConfig?.version !== firmware.name,
}
)}
onClick={() => {
selectVersion(firmware.name);
}}
>
{getName(firmware.name)}
</div>
))}
</div>
</div>
<div className="flex justify-between">
<Localized id="firmware_tool-previous_step">
<Button
variant="tertiary"
onClick={() => {
if (defaultConfig?.shouldOnlyUseDefaults) {
goTo('SelectBoard');
} else {
prevStep();
}
}}
></Button>
</Localized>
<Localized id="firmware_tool-next_step">
<Button
variant="primary"
disabled={!newConfig?.version}
onClick={nextStep}
></Button>
</Localized>
</div>
</div>
)}
{isFetching && (
<div className="flex justify-center flex-col items-center gap-3 h-44">
<LoaderIcon slimeState={SlimeState.JUMPY}></LoaderIcon>
<Localized id="firmware_tool-loading">
<Typography color="secondary"></Typography>
</Localized>
</div>
)}
<div className="flex flex-col w-full">
<div className="flex justify-between items-center mobile:flex-col gap-4">
<Typography color="secondary">
{l10n.getString('firmware_tool-select_firmware_step-description')}
</Typography>
<div>
<Localized
id="firmware_tool-select_firmware_step-show-third-party"
attrs={{ label: true }}
>
<CheckBox
control={control}
name="thirdParty"
label="Show third party firmwares"
/>
</Localized>
</div>
</div>
</>
<div className="my-4">
{!isFetching && (
<div className="flex flex-col gap-4">
<div className="xs-settings:max-h-96 xs-settings:overflow-y-auto xs-settings:px-2">
<div className="grid sm:grid-cols-2 mobile-settings:grid-cols-1 gap-2">
{filteredFirmwares?.map((firmware) => (
<div
key={firmware.id}
className={classNames(
'p-3 rounded-md hover:bg-background-50',
{
'bg-background-50 text-background-10':
newConfig?.version === firmware.name,
'bg-background-60':
newConfig?.version !== firmware.name,
}
)}
onClick={() => {
selectVersion(firmware.name);
}}
>
{getName(firmware.name)}
</div>
))}
</div>
</div>
<div className="flex justify-between">
<Localized id="firmware_tool-previous_step">
<Button
variant="tertiary"
onClick={() => {
if (defaultConfig?.shouldOnlyUseDefaults) {
goTo('SelectBoard');
} else {
prevStep();
}
}}
/>
</Localized>
<Localized id="firmware_tool-next_step">
<Button
variant="primary"
disabled={!newConfig?.version}
onClick={nextStep}
/>
</Localized>
</div>
</div>
)}
{isFetching && (
<div className="flex justify-center flex-col items-center gap-3 h-44">
<LoaderIcon slimeState={SlimeState.JUMPY} />
<Localized id="firmware_tool-loading">
<Typography color="secondary" />
</Localized>
</div>
)}
</div>
</div>
);
}
@@ -36,7 +36,7 @@ import { devicesAtom } from '@/store/app-store';
import { checkForUpdate } from '@/hooks/firmware-update';
interface FirmwareUpdateForm {
selectedDevices: { [key: string]: boolean };
selectedDevices: Record<string, boolean>;
}
interface UpdateStatus {
@@ -60,9 +60,9 @@ const DeviceList = ({
}) => {
const { l10n } = useLocalization();
return devices.map((device, index) => (
return devices.map((device) => (
<DeviceCardControl
key={index}
key={device.id?.id}
control={control}
name={`selectedDevices.${device.id?.id ?? 0}`}
deviceNames={deviceNames(device, l10n)}
@@ -74,7 +74,7 @@ const StatusList = ({ status }: { status: Record<string, UpdateStatus> }) => {
const statusKeys = Object.keys(status);
const devices = useAtomValue(devicesAtom);
return statusKeys.map((id, index) => {
return statusKeys.map((id) => {
const val = status[id];
if (!val) throw new Error('there should always be a val');
@@ -85,19 +85,19 @@ const StatusList = ({ status }: { status: Record<string, UpdateStatus> }) => {
<DeviceCardControl
status={val.status}
progress={val.progress}
key={index}
key={id}
deviceNames={val.deviceNames}
online={device?.trackers.some(
({ status }) => status === TrackerStatus.OK
)}
></DeviceCardControl>
/>
);
});
};
const MarkdownLink = (props: ComponentProps<'a'>) => (
<A href={props.href}>{props.children}</A>
);
function MarkdownLink({ href, children }: ComponentProps<'a'>) {
return <A href={href}>{children}</A>;
}
export function FirmwareUpdate() {
const navigate = useNavigate();
@@ -312,15 +312,15 @@ export function FirmwareUpdate() {
<div className="flex flex-col p-4 w-full items-center justify-center">
<div className="mobile:w-full w-10/12 h-full flex flex-col gap-2">
<Localized id="firmware_update-title">
<Typography variant="main-title"></Typography>
<Typography variant="main-title" />
</Localized>
<div className="grid md:grid-cols-2 xs:grid-cols-1 gap-5">
<div className="flex flex-col gap-2">
<Localized id="firmware_update-devices">
<Typography variant="section-title"></Typography>
<Typography variant="section-title" />
</Localized>
<Localized id="firmware_update-devices-description">
<Typography variant="standard" color="secondary"></Typography>
<Typography variant="standard" color="secondary" />
</Localized>
<div className="flex flex-col gap-4 overflow-y-auto xs:max-h-[530px]">
{devices.length === 0 &&
@@ -337,9 +337,9 @@ export function FirmwareUpdate() {
)}
<div className="flex flex-col gap-4 h-full">
{statusKeys.length > 0 ? (
<StatusList status={status}></StatusList>
<StatusList status={status} />
) : (
<DeviceList control={control} devices={devices}></DeviceList>
<DeviceList control={control} devices={devices} />
)}
{devices.length === 0 && statusKeys.length === 0 && (
<div
@@ -347,9 +347,9 @@ export function FirmwareUpdate() {
'rounded-xl bg-background-60 justify-center flex-col items-center flex pb-10 py-5 gap-5'
)}
>
<LoaderIcon slimeState={SlimeState.JUMPY}></LoaderIcon>
<LoaderIcon slimeState={SlimeState.JUMPY} />
<Localized id="firmware_update-looking_for_devices">
<Typography></Typography>
<Typography />
</Localized>
</div>
)}
@@ -361,7 +361,7 @@ export function FirmwareUpdate() {
id="firmware_update-changelog-title"
vars={{ version: currentFirmwareRelease?.name ?? 'unknown' }}
>
<Typography variant="main-title"></Typography>
<Typography variant="main-title" />
</Localized>
<div className="overflow-y-scroll max-h-[430px] md:h-[430px] bg-background-60 rounded-lg p-4">
<Markdown
@@ -380,25 +380,21 @@ export function FirmwareUpdate() {
</div>
<div className="flex justify-end pb-2 gap-2 mobile:flex-col">
<Localized id="firmware_update-retry">
<Button
variant="secondary"
disabled={!canRetry}
onClick={retry}
></Button>
<Button variant="secondary" disabled={!canRetry} onClick={retry} />
</Localized>
<Localized id="firmware_update-update">
<Button
variant="primary"
disabled={!canStartUpdate}
onClick={startUpdate}
></Button>
/>
</Localized>
<Localized id="firmware_update-exit">
<Button
variant="primary"
onClick={exit}
disabled={hasPendingTrackers}
></Button>
/>
</Localized>
</div>
</div>
+7 -6
View File
@@ -17,6 +17,7 @@ import classNames from 'classnames';
import { useAtomValue } from 'jotai';
import { flatTrackersAtom } from '@/store/app-store';
import { useVRCConfig } from '@/hooks/vrc-config';
import { uniqueNumberFromTracker } from '@/hooks/tracker';
const DONT_REPEAT_STATUSES = [StatusData.StatusTrackerReset];
@@ -49,7 +50,7 @@ export function Home() {
to="/vr-mode"
className="xs:hidden absolute z-50 h-12 w-12 rounded-full bg-accent-background-30 bottom-3 right-3 flex justify-center items-center fill-background-10"
>
<HeadsetIcon></HeadsetIcon>
<HeadsetIcon />
</NavLink>
<div className="h-full overflow-y-auto">
<div
@@ -74,12 +75,12 @@ export function Home() {
<WarningBox whitespace={false}>
<div className="flex gap-2 justify-between items-center w-full">
<div className="flex">
<Localized id={'vrc_config-invalid'}></Localized>
<Localized id={'vrc_config-invalid'} />
</div>
<div className="flex">
<Link to="/vrc-warnings">
<div className="rounded-md p-2 bg-background-90 bg-opacity-15 hover:bg-background-10 hover:bg-opacity-25 text-nowrap">
<Localized id={'vrc_config-show_more'}></Localized>
<Localized id={'vrc_config-show_more'} />
</div>
</Link>
</div>
@@ -98,9 +99,9 @@ export function Home() {
{!config?.debug && trackers.length > 0 && (
<div className="grid sm:grid-cols-1 md:grid-cols-2 gap-4 px-5 my-5">
{trackers.map(({ tracker, device }, index) => (
{trackers.map(({ tracker, device }) => (
<TrackerCard
key={index}
key={uniqueNumberFromTracker(tracker)}
tracker={tracker}
device={device}
onClick={() => sendToSettings(tracker)}
@@ -119,7 +120,7 @@ export function Home() {
<TrackersTable
flatTrackers={trackers}
clickedTracker={(tracker) => sendToSettings(tracker)}
></TrackersTable>
/>
</div>
)}
</div>
+83 -10
View File
@@ -1,6 +1,7 @@
import { useLocalization } from '@fluent/react';
import { useEffect, useMemo, useRef, useState } from 'react';
import {
BodyPart,
ResetRequestT,
ResetType,
RpcMessage,
@@ -22,16 +23,20 @@ import {
} from '@/components/commons/icon/ResetIcon';
import { useStatusContext } from '@/hooks/status-system';
import classNames from 'classnames';
import { FootIcon } from '@/components/commons/icon/FootIcon';
import { FingersIcon } from '@/components/commons/icon/FingersIcon';
export function ResetButton({
type,
size = 'big',
bodyPartsToReset = 'default',
className,
onReseted,
}: {
className?: string;
type: ResetType;
size: 'big' | 'small';
bodyPartsToReset?: 'default' | 'feet' | 'fingers';
onReseted?: () => void;
}) {
const { l10n } = useLocalization();
@@ -50,9 +55,55 @@ export function ResetButton({
[statuses]
);
const feetBodyParts = [BodyPart.LEFT_FOOT, BodyPart.RIGHT_FOOT];
const fingerBodyParts = [
BodyPart.LEFT_THUMB_METACARPAL,
BodyPart.LEFT_THUMB_PROXIMAL,
BodyPart.LEFT_THUMB_DISTAL,
BodyPart.LEFT_INDEX_PROXIMAL,
BodyPart.LEFT_INDEX_INTERMEDIATE,
BodyPart.LEFT_INDEX_DISTAL,
BodyPart.LEFT_MIDDLE_PROXIMAL,
BodyPart.LEFT_MIDDLE_INTERMEDIATE,
BodyPart.LEFT_MIDDLE_DISTAL,
BodyPart.LEFT_RING_PROXIMAL,
BodyPart.LEFT_RING_INTERMEDIATE,
BodyPart.LEFT_RING_DISTAL,
BodyPart.LEFT_LITTLE_PROXIMAL,
BodyPart.LEFT_LITTLE_INTERMEDIATE,
BodyPart.LEFT_LITTLE_DISTAL,
BodyPart.RIGHT_THUMB_METACARPAL,
BodyPart.RIGHT_THUMB_PROXIMAL,
BodyPart.RIGHT_THUMB_DISTAL,
BodyPart.RIGHT_INDEX_PROXIMAL,
BodyPart.RIGHT_INDEX_INTERMEDIATE,
BodyPart.RIGHT_INDEX_DISTAL,
BodyPart.RIGHT_MIDDLE_PROXIMAL,
BodyPart.RIGHT_MIDDLE_INTERMEDIATE,
BodyPart.RIGHT_MIDDLE_DISTAL,
BodyPart.RIGHT_RING_PROXIMAL,
BodyPart.RIGHT_RING_INTERMEDIATE,
BodyPart.RIGHT_RING_DISTAL,
BodyPart.RIGHT_LITTLE_PROXIMAL,
BodyPart.RIGHT_LITTLE_INTERMEDIATE,
BodyPart.RIGHT_LITTLE_DISTAL,
];
const reset = () => {
const req = new ResetRequestT();
req.resetType = type;
switch (bodyPartsToReset) {
case 'default':
// Server handles it. Usually all body parts except fingers.
req.bodyParts = [];
break;
case 'feet':
req.bodyParts = feetBodyParts;
break;
case 'fingers':
req.bodyParts = fingerBodyParts;
break;
}
sendRPCPacket(RpcMessage.ResetRequest, req);
};
@@ -75,22 +126,43 @@ export function ResetButton({
const text = useMemo(() => {
switch (type) {
case ResetType.Yaw:
return l10n.getString('reset-yaw');
return l10n.getString(
`reset-yaw${
bodyPartsToReset !== 'default' ? `-${bodyPartsToReset}` : ''
}`
);
case ResetType.Mounting:
return l10n.getString('reset-mounting');
return l10n.getString(
`reset-mounting${
bodyPartsToReset !== 'default' ? `-${bodyPartsToReset}` : ''
}`
);
case ResetType.Full:
return l10n.getString('reset-full');
return l10n.getString(
`reset-full${
bodyPartsToReset !== 'default' ? `-${bodyPartsToReset}` : ''
}`
);
}
}, [type]);
}, [type, bodyPartsToReset]);
const getIcon = () => {
switch (type) {
case ResetType.Yaw:
return <YawResetIcon width={20} />;
case ResetType.Mounting:
return <MountingResetIcon width={20} />;
switch (bodyPartsToReset) {
case 'feet':
return <FootIcon width={30} />;
case 'fingers':
return <FingersIcon width={20} />;
case 'default':
default:
return <MountingResetIcon width={20} />;
}
case ResetType.Full:
return <FullResetIcon width={20} />;
}
return <FullResetIcon width={20} />;
};
const maybePlaySoundOnResetEnd = (type: ResetType) => {
@@ -110,12 +182,13 @@ export function ResetButton({
maybePlaySoundOnResetStart();
};
useEffect(() => {
return () => {
useEffect(
() => () => {
if (finishedTimeoutRef.current !== -1)
clearTimeout(finishedTimeoutRef.current);
};
}, []);
},
[]
);
return size === 'small' ? (
<Button
+233 -235
View File
@@ -3,10 +3,10 @@ import { BodyPart } from 'solarxr-protocol';
import { AssignMode } from '@/hooks/config';
import { BodyInteractions } from '@/components/commons/BodyInteractions';
import { TrackerPartCard } from '@/components/tracker/TrackerPartCard';
import { BodyPartError } from './pages/trackers-assign/TrackerAssignment';
import { SIDES } from '@/components/commons/PersonFrontIcon';
import { useAtomValue } from 'jotai';
import { assignedTrackersAtom, FlatDeviceTracker } from '@/store/app-store';
import { BodyPartError } from './pages/trackers-assign/TrackerAssignment';
export const ARMS_PARTS = new Set([
BodyPart.LEFT_UPPER_ARM,
@@ -116,7 +116,7 @@ export function BodyAssignment({
const trackerPartGrouped = useMemo(
() =>
assignedTrackers.reduce<{ [key: number]: FlatDeviceTracker[] }>(
assignedTrackers.reduce<Record<number, FlatDeviceTracker[]>>(
(curr, td) => {
if (!td && onlyAssigned) return curr;
@@ -151,251 +151,249 @@ export function BodyAssignment({
);
return (
<>
<BodyInteractions
width={width}
mirror={mirror}
dotsSize={dotSize}
assignedRoles={assignedRoles}
highlightedRoles={highlightedRoles}
onSelectRole={onRoleSelected}
leftControls={
<div className="flex flex-col justify-between h-full text-right">
<div className="flex flex-col gap-2">
{hasBodyPart(BodyPart.HEAD) && (
<TrackerPartCard
onlyAssigned={onlyAssigned}
roleError={rolesWithErrors[BodyPart.HEAD]?.label}
td={trackerPartGrouped[BodyPart.HEAD]}
role={BodyPart.HEAD}
onClick={() => onRoleSelected(BodyPart.HEAD)}
direction="right"
/>
)}
{hasBodyPart(BodyPart.NECK) && (
<TrackerPartCard
onlyAssigned={onlyAssigned}
roleError={rolesWithErrors[BodyPart.NECK]?.label}
td={trackerPartGrouped[BodyPart.NECK]}
role={BodyPart.NECK}
onClick={() => onRoleSelected(BodyPart.NECK)}
direction="right"
/>
)}
</div>
<div className="flex flex-col gap-2">
{hasBodyPart(SIDES[left].shoulder) && (
<TrackerPartCard
onlyAssigned={onlyAssigned}
roleError={rolesWithErrors[SIDES[left].shoulder]?.label}
td={trackerPartGrouped[SIDES[left].shoulder]}
role={SIDES[left].shoulder}
onClick={() => onRoleSelected(SIDES[left].shoulder)}
direction="right"
/>
)}
{hasBodyPart(SIDES[left].upperArm) && (
<TrackerPartCard
onlyAssigned={onlyAssigned}
roleError={rolesWithErrors[SIDES[left].upperArm]?.label}
td={trackerPartGrouped[SIDES[left].upperArm]}
role={SIDES[left].upperArm}
onClick={() => onRoleSelected(SIDES[left].upperArm)}
direction="right"
/>
)}
</div>
<div className="flex flex-col gap-2">
{hasBodyPart(SIDES[left].lowerArm) && (
<TrackerPartCard
onlyAssigned={onlyAssigned}
roleError={rolesWithErrors[SIDES[left].lowerArm]?.label}
td={trackerPartGrouped[SIDES[left].lowerArm]}
role={SIDES[left].lowerArm}
onClick={() => onRoleSelected(SIDES[left].lowerArm)}
direction="right"
/>
)}
{hasBodyPart(SIDES[left].hand) && (
<TrackerPartCard
onlyAssigned={onlyAssigned}
roleError={rolesWithErrors[SIDES[left].hand]?.label}
td={trackerPartGrouped[SIDES[left].hand]}
role={SIDES[left].hand}
onClick={() => onRoleSelected(SIDES[left].hand)}
direction="right"
/>
)}
</div>
<div className="flex flex-col gap-2">
{hasBodyPart(SIDES[left].upperLeg) && (
<TrackerPartCard
onlyAssigned={onlyAssigned}
roleError={rolesWithErrors[SIDES[left].upperLeg]?.label}
td={trackerPartGrouped[SIDES[left].upperLeg]}
role={SIDES[left].upperLeg}
onClick={() => onRoleSelected(SIDES[left].upperLeg)}
direction="right"
/>
)}
{hasBodyPart(SIDES[left].lowerLeg) && (
<TrackerPartCard
onlyAssigned={onlyAssigned}
roleError={rolesWithErrors[SIDES[left].lowerLeg]?.label}
td={trackerPartGrouped[SIDES[left].lowerLeg]}
role={SIDES[left].lowerLeg}
onClick={() => onRoleSelected(SIDES[left].lowerLeg)}
direction="right"
/>
)}
{hasBodyPart(SIDES[left].foot) && (
<TrackerPartCard
onlyAssigned={onlyAssigned}
roleError={rolesWithErrors[SIDES[left].foot]?.label}
td={trackerPartGrouped[SIDES[left].foot]}
role={SIDES[left].foot}
onClick={() => onRoleSelected(SIDES[left].foot)}
direction="right"
/>
)}
</div>
</div>
}
rightControls={
<div className="flex flex-col justify-between h-full">
{hasBodyPart(BodyPart.UPPER_CHEST) && (
<BodyInteractions
width={width}
mirror={mirror}
dotsSize={dotSize}
assignedRoles={assignedRoles}
highlightedRoles={highlightedRoles}
onSelectRole={onRoleSelected}
leftControls={
<div className="flex flex-col justify-between h-full text-right">
<div className="flex flex-col gap-2">
{hasBodyPart(BodyPart.HEAD) && (
<TrackerPartCard
onlyAssigned={onlyAssigned}
roleError={rolesWithErrors[BodyPart.UPPER_CHEST]?.label}
td={trackerPartGrouped[BodyPart.UPPER_CHEST]}
role={BodyPart.UPPER_CHEST}
onClick={() => onRoleSelected(BodyPart.UPPER_CHEST)}
roleError={rolesWithErrors[BodyPart.HEAD]?.label}
td={trackerPartGrouped[BodyPart.HEAD]}
role={BodyPart.HEAD}
onClick={() => onRoleSelected(BodyPart.HEAD)}
direction="right"
/>
)}
{hasBodyPart(BodyPart.NECK) && (
<TrackerPartCard
onlyAssigned={onlyAssigned}
roleError={rolesWithErrors[BodyPart.NECK]?.label}
td={trackerPartGrouped[BodyPart.NECK]}
role={BodyPart.NECK}
onClick={() => onRoleSelected(BodyPart.NECK)}
direction="right"
/>
)}
</div>
<div className="flex flex-col gap-2">
{hasBodyPart(SIDES[left].shoulder) && (
<TrackerPartCard
onlyAssigned={onlyAssigned}
roleError={rolesWithErrors[SIDES[left].shoulder]?.label}
td={trackerPartGrouped[SIDES[left].shoulder]}
role={SIDES[left].shoulder}
onClick={() => onRoleSelected(SIDES[left].shoulder)}
direction="right"
/>
)}
{hasBodyPart(SIDES[left].upperArm) && (
<TrackerPartCard
onlyAssigned={onlyAssigned}
roleError={rolesWithErrors[SIDES[left].upperArm]?.label}
td={trackerPartGrouped[SIDES[left].upperArm]}
role={SIDES[left].upperArm}
onClick={() => onRoleSelected(SIDES[left].upperArm)}
direction="right"
/>
)}
</div>
<div className="flex flex-col gap-2">
{hasBodyPart(SIDES[left].lowerArm) && (
<TrackerPartCard
onlyAssigned={onlyAssigned}
roleError={rolesWithErrors[SIDES[left].lowerArm]?.label}
td={trackerPartGrouped[SIDES[left].lowerArm]}
role={SIDES[left].lowerArm}
onClick={() => onRoleSelected(SIDES[left].lowerArm)}
direction="right"
/>
)}
{hasBodyPart(SIDES[left].hand) && (
<TrackerPartCard
onlyAssigned={onlyAssigned}
roleError={rolesWithErrors[SIDES[left].hand]?.label}
td={trackerPartGrouped[SIDES[left].hand]}
role={SIDES[left].hand}
onClick={() => onRoleSelected(SIDES[left].hand)}
direction="right"
/>
)}
</div>
<div className="flex flex-col gap-2">
{hasBodyPart(SIDES[left].upperLeg) && (
<TrackerPartCard
onlyAssigned={onlyAssigned}
roleError={rolesWithErrors[SIDES[left].upperLeg]?.label}
td={trackerPartGrouped[SIDES[left].upperLeg]}
role={SIDES[left].upperLeg}
onClick={() => onRoleSelected(SIDES[left].upperLeg)}
direction="right"
/>
)}
{hasBodyPart(SIDES[left].lowerLeg) && (
<TrackerPartCard
onlyAssigned={onlyAssigned}
roleError={rolesWithErrors[SIDES[left].lowerLeg]?.label}
td={trackerPartGrouped[SIDES[left].lowerLeg]}
role={SIDES[left].lowerLeg}
onClick={() => onRoleSelected(SIDES[left].lowerLeg)}
direction="right"
/>
)}
{hasBodyPart(SIDES[left].foot) && (
<TrackerPartCard
onlyAssigned={onlyAssigned}
roleError={rolesWithErrors[SIDES[left].foot]?.label}
td={trackerPartGrouped[SIDES[left].foot]}
role={SIDES[left].foot}
onClick={() => onRoleSelected(SIDES[left].foot)}
direction="right"
/>
)}
</div>
</div>
}
rightControls={
<div className="flex flex-col justify-between h-full">
{hasBodyPart(BodyPart.UPPER_CHEST) && (
<TrackerPartCard
onlyAssigned={onlyAssigned}
roleError={rolesWithErrors[BodyPart.UPPER_CHEST]?.label}
td={trackerPartGrouped[BodyPart.UPPER_CHEST]}
role={BodyPart.UPPER_CHEST}
onClick={() => onRoleSelected(BodyPart.UPPER_CHEST)}
direction="left"
/>
)}
{hasBodyPart(BodyPart.CHEST) && (
<TrackerPartCard
onlyAssigned={onlyAssigned}
roleError={rolesWithErrors[BodyPart.CHEST]?.label}
td={trackerPartGrouped[BodyPart.CHEST]}
role={BodyPart.CHEST}
onClick={() => onRoleSelected(BodyPart.CHEST)}
direction="left"
/>
)}
<div className="flex flex-col gap-2">
{hasBodyPart(SIDES[right].shoulder) && (
<TrackerPartCard
onlyAssigned={onlyAssigned}
roleError={rolesWithErrors[SIDES[right].shoulder]?.label}
td={trackerPartGrouped[SIDES[right].shoulder]}
role={SIDES[right].shoulder}
onClick={() => onRoleSelected(SIDES[right].shoulder)}
direction="left"
/>
)}
{hasBodyPart(BodyPart.CHEST) && (
{hasBodyPart(SIDES[right].upperArm) && (
<TrackerPartCard
onlyAssigned={onlyAssigned}
roleError={rolesWithErrors[BodyPart.CHEST]?.label}
td={trackerPartGrouped[BodyPart.CHEST]}
role={BodyPart.CHEST}
onClick={() => onRoleSelected(BodyPart.CHEST)}
roleError={rolesWithErrors[SIDES[right].upperArm]?.label}
td={trackerPartGrouped[SIDES[right].upperArm]}
role={SIDES[right].upperArm}
onClick={() => onRoleSelected(SIDES[right].upperArm)}
direction="left"
/>
)}
</div>
<div className="flex flex-col gap-2">
{hasBodyPart(BodyPart.WAIST) && (
<TrackerPartCard
onlyAssigned={onlyAssigned}
roleError={rolesWithErrors[BodyPart.WAIST]?.label}
td={trackerPartGrouped[BodyPart.WAIST]}
onClick={() => onRoleSelected(BodyPart.WAIST)}
role={BodyPart.WAIST}
direction="left"
/>
)}
<div className="flex flex-col gap-2">
{hasBodyPart(SIDES[right].shoulder) && (
<TrackerPartCard
onlyAssigned={onlyAssigned}
roleError={rolesWithErrors[SIDES[right].shoulder]?.label}
td={trackerPartGrouped[SIDES[right].shoulder]}
role={SIDES[right].shoulder}
onClick={() => onRoleSelected(SIDES[right].shoulder)}
direction="left"
/>
)}
{hasBodyPart(SIDES[right].upperArm) && (
<TrackerPartCard
onlyAssigned={onlyAssigned}
roleError={rolesWithErrors[SIDES[right].upperArm]?.label}
td={trackerPartGrouped[SIDES[right].upperArm]}
role={SIDES[right].upperArm}
onClick={() => onRoleSelected(SIDES[right].upperArm)}
direction="left"
/>
)}
</div>
<div className="flex flex-col gap-2">
{hasBodyPart(BodyPart.WAIST) && (
<TrackerPartCard
onlyAssigned={onlyAssigned}
roleError={rolesWithErrors[BodyPart.WAIST]?.label}
td={trackerPartGrouped[BodyPart.WAIST]}
onClick={() => onRoleSelected(BodyPart.WAIST)}
role={BodyPart.WAIST}
direction="left"
/>
)}
{hasBodyPart(BodyPart.HIP) && (
<TrackerPartCard
onlyAssigned={onlyAssigned}
roleError={rolesWithErrors[BodyPart.HIP]?.label}
td={trackerPartGrouped[BodyPart.HIP]}
onClick={() => onRoleSelected(BodyPart.HIP)}
role={BodyPart.HIP}
direction="left"
/>
)}
</div>
<div className="flex flex-col gap-2">
{hasBodyPart(SIDES[right].lowerArm) && (
<TrackerPartCard
onlyAssigned={onlyAssigned}
roleError={rolesWithErrors[SIDES[right].lowerArm]?.label}
td={trackerPartGrouped[SIDES[right].lowerArm]}
role={SIDES[right].lowerArm}
onClick={() => onRoleSelected(SIDES[right].lowerArm)}
direction="left"
/>
)}
{hasBodyPart(SIDES[right].hand) && (
<TrackerPartCard
onlyAssigned={onlyAssigned}
roleError={rolesWithErrors[SIDES[right].hand]?.label}
td={trackerPartGrouped[SIDES[right].hand]}
onClick={() => onRoleSelected(SIDES[right].hand)}
role={SIDES[right].hand}
direction="left"
/>
)}
</div>
<div className="flex flex-col gap-2">
{hasBodyPart(SIDES[right].upperLeg) && (
<TrackerPartCard
onlyAssigned={onlyAssigned}
roleError={rolesWithErrors[SIDES[right].upperLeg]?.label}
td={trackerPartGrouped[SIDES[right].upperLeg]}
role={SIDES[right].upperLeg}
onClick={() => onRoleSelected(SIDES[right].upperLeg)}
direction="left"
/>
)}
{hasBodyPart(SIDES[right].lowerLeg) && (
<TrackerPartCard
onlyAssigned={onlyAssigned}
roleError={rolesWithErrors[SIDES[right].lowerLeg]?.label}
td={trackerPartGrouped[SIDES[right].lowerLeg]}
role={SIDES[right].lowerLeg}
onClick={() => onRoleSelected(SIDES[right].lowerLeg)}
direction="left"
/>
)}
{hasBodyPart(SIDES[right].foot) && (
<TrackerPartCard
onlyAssigned={onlyAssigned}
roleError={rolesWithErrors[SIDES[right].foot]?.label}
td={trackerPartGrouped[SIDES[right].foot]}
role={SIDES[right].foot}
onClick={() => onRoleSelected(SIDES[right].foot)}
direction="left"
/>
)}
</div>
{hasBodyPart(BodyPart.HIP) && (
<TrackerPartCard
onlyAssigned={onlyAssigned}
roleError={rolesWithErrors[BodyPart.HIP]?.label}
td={trackerPartGrouped[BodyPart.HIP]}
onClick={() => onRoleSelected(BodyPart.HIP)}
role={BodyPart.HIP}
direction="left"
/>
)}
</div>
}
></BodyInteractions>
</>
<div className="flex flex-col gap-2">
{hasBodyPart(SIDES[right].lowerArm) && (
<TrackerPartCard
onlyAssigned={onlyAssigned}
roleError={rolesWithErrors[SIDES[right].lowerArm]?.label}
td={trackerPartGrouped[SIDES[right].lowerArm]}
role={SIDES[right].lowerArm}
onClick={() => onRoleSelected(SIDES[right].lowerArm)}
direction="left"
/>
)}
{hasBodyPart(SIDES[right].hand) && (
<TrackerPartCard
onlyAssigned={onlyAssigned}
roleError={rolesWithErrors[SIDES[right].hand]?.label}
td={trackerPartGrouped[SIDES[right].hand]}
onClick={() => onRoleSelected(SIDES[right].hand)}
role={SIDES[right].hand}
direction="left"
/>
)}
</div>
<div className="flex flex-col gap-2">
{hasBodyPart(SIDES[right].upperLeg) && (
<TrackerPartCard
onlyAssigned={onlyAssigned}
roleError={rolesWithErrors[SIDES[right].upperLeg]?.label}
td={trackerPartGrouped[SIDES[right].upperLeg]}
role={SIDES[right].upperLeg}
onClick={() => onRoleSelected(SIDES[right].upperLeg)}
direction="left"
/>
)}
{hasBodyPart(SIDES[right].lowerLeg) && (
<TrackerPartCard
onlyAssigned={onlyAssigned}
roleError={rolesWithErrors[SIDES[right].lowerLeg]?.label}
td={trackerPartGrouped[SIDES[right].lowerLeg]}
role={SIDES[right].lowerLeg}
onClick={() => onRoleSelected(SIDES[right].lowerLeg)}
direction="left"
/>
)}
{hasBodyPart(SIDES[right].foot) && (
<TrackerPartCard
onlyAssigned={onlyAssigned}
roleError={rolesWithErrors[SIDES[right].foot]?.label}
td={trackerPartGrouped[SIDES[right].foot]}
role={SIDES[right].foot}
onClick={() => onRoleSelected(SIDES[right].foot)}
direction="left"
/>
)}
</div>
</div>
}
/>
);
}
@@ -40,7 +40,7 @@ export function NeckWarningModal({
<div className="flex w-full flex-col flex-grow items-center gap-3">
<Localized
id="tracker_selection_menu-neck_warning"
elems={{ b: <b></b> }}
elems={{ b: <b /> }}
>
<WarningBox>
<b>Warning:</b> A neck tracker can be deadly if adjusted too
@@ -15,22 +15,22 @@ export function OnboardingLayout({ children }: { children: ReactNode }) {
return !state.alonePage ? (
<div className="onboarding-layout h-full">
<div style={{ gridArea: 't' }}>
<TopBar progress={state.progress}></TopBar>
<TopBar progress={state.progress} />
</div>
<div style={{ gridArea: 'c' }} className="mt-2 relative">
<div className="absolute top-12 mobile:top-0 right-2 z-50">
<SkipSetupButton
visible={true}
visible
modalVisible={showWarning}
onClick={() => setShowWarning(true)}
></SkipSetupButton>
/>
</div>
<div className="h-full w-full overflow-y-auto">{children}</div>
<SkipSetupWarningModal
accept={skipSetup}
onClose={() => setShowWarning(false)}
isOpen={showWarning}
></SkipSetupWarningModal>
/>
</div>
</div>
) : (
@@ -11,7 +11,7 @@ export function SkipSetupButton({
modalVisible: boolean;
visible: boolean;
}) {
if (!visible) return <></>;
if (!visible) return null;
useEffect(() => {
if (modalVisible) return;
@@ -35,7 +35,7 @@ export function SkipSetupButton({
onClick={onClick}
>
<div className="flex flex-col justify-center items-center">
<EscapeIcon size={42}></EscapeIcon>
<EscapeIcon size={42} />
<p className="text-standard">ESC</p>
</div>
</button>
@@ -40,7 +40,7 @@ export function SkipSetupWarningModal({
>
<div className="flex w-full h-full flex-col ">
<div className="flex flex-col flex-grow items-center gap-3">
<Localized id="onboarding-setup_warning" elems={{ b: <b></b> }}>
<Localized id="onboarding-setup_warning" elems={{ b: <b /> }}>
<WarningBox>
<b>Warning:</b> The setup is needed for good tracking, this is
required if this is your first time using SlimeVR.
@@ -19,10 +19,10 @@ type StepComponentType = FC<{
variant: 'alone' | 'onboarding';
active: boolean;
}>;
export type Step = {
export interface Step {
type: 'numbered' | 'fullsize';
component: StepComponentType;
};
}
export function StepContainer({
children,
@@ -83,9 +83,7 @@ export function StepDot({
)}
onClick={onClick}
>
{active && (
<div className="flex h-2 w-2 rounded-full bg-background-10"></div>
)}
{active && <div className="flex h-2 w-2 rounded-full bg-background-10" />}
{done && <CheckIcon />}
</div>
);
@@ -162,6 +160,7 @@ export function StepperSlider({
{steps.map(({ type, component: StepComponent }, index) => (
<StepContainer
variant={variant}
// eslint-disable-next-line react/no-array-index-key
key={index}
type={type}
width={width}
@@ -181,9 +180,10 @@ export function StepperSlider({
</div>
<div className="flex justify-center items-center gap-2">
{Array.from({ length: steps.length }).map((_, index) => (
// eslint-disable-next-line react/no-array-index-key
<div key={index} className="flex items-center gap-2">
{index !== 0 && (
<div className="w-5 h-1 bg-background-50 rounded-full"></div>
<div className="w-5 h-1 bg-background-50 rounded-full" />
)}
<StepDot
active={index === step}
@@ -75,7 +75,7 @@ export function CalibrationTutorialPage() {
setCalibrationStatus(CalibrationStatus.ERROR);
abortCountdown();
}
}, [calibrationStatus, rested]);
}, [abortCountdown, calibrationStatus, rested]);
const progressBarClass = useMemo(() => {
switch (calibrationStatus) {
@@ -83,6 +83,8 @@ export function CalibrationTutorialPage() {
return 'bg-status-critical';
case CalibrationStatus.SUCCESS:
return 'bg-status-success';
default:
return undefined;
}
}, [calibrationStatus]);
@@ -115,102 +117,100 @@ export function CalibrationTutorialPage() {
applyProgress(0.43);
return (
<>
<div className="flex flex-col gap-5 h-full items-center w-full justify-center relative">
<div className="flex w-full h-full justify-center xs:px-20 mobile:px-5 pb-5 gap-14">
<div className="flex gap-4 self-center mobile:z-10">
<div className="flex flex-col max-w-md gap-3">
<div>
<Typography variant="mobile-title">
{l10n.getString('onboarding-calibration_tutorial')}
</Typography>
<Typography variant="vr-accessible" italic>
{l10n.getString('onboarding-calibration_tutorial-subtitle')}
</Typography>
</div>
<Localized
id="onboarding-calibration_tutorial-description-v1"
elems={{ b: <b></b> }}
>
<Typography color="secondary">
Description on calibration of IMU
</Typography>
</Localized>
<div>
<div className="xs:hidden flex flex-row justify-center">
<div className="stroke-none fill-background-10 ">
<TaybolIcon width="220"></TaybolIcon>
</div>
<div className="flex flex-col gap-5 h-full items-center w-full justify-center relative">
<div className="flex w-full h-full justify-center xs:px-20 mobile:px-5 pb-5 gap-14">
<div className="flex gap-4 self-center mobile:z-10">
<div className="flex flex-col max-w-md gap-3">
<div>
<Typography variant="mobile-title">
{l10n.getString('onboarding-calibration_tutorial')}
</Typography>
<Typography variant="vr-accessible" italic>
{l10n.getString('onboarding-calibration_tutorial-subtitle')}
</Typography>
</div>
<Localized
id="onboarding-calibration_tutorial-description-v1"
elems={{ b: <b /> }}
>
<Typography color="secondary">
Description on calibration of IMU
</Typography>
</Localized>
<div>
<div className="xs:hidden flex flex-row justify-center">
<div className="stroke-none fill-background-10 ">
<TaybolIcon width="220" />
</div>
<div className="flex justify-center">
<LoaderIcon slimeState={slimeStatus}></LoaderIcon>
</div>
<ProgressBar
progress={
isCounting
? (IMU_CALIBRATION_TIME - timer) / IMU_CALIBRATION_TIME
: calibrationStatus === CalibrationStatus.SUCCESS ||
calibrationStatus === CalibrationStatus.ERROR
? 1
: 0
}
height={14}
animated={true}
colorClass={progressBarClass}
></ProgressBar>
</div>
<div className="flex justify-center">
<Typography variant="section-title">{progressText}</Typography>
</div>
<div className="flex gap-3 mobile:flex-col">
<Button
variant="secondary"
to="/onboarding/wifi-creds"
className="xs:mr-auto"
>
{l10n.getString('onboarding-previous_step')}
</Button>
<Button
variant="primary"
onClick={() => {
setCalibrationStatus(CalibrationStatus.CALIBRATING);
startCountdown();
}}
disabled={isCounting || !rested}
className={classNames(
'xs:ml-auto',
CalibrationStatus.SUCCESS === calibrationStatus && 'hidden'
)}
>
{l10n.getString('onboarding-calibration_tutorial-calibrate')}
</Button>
<Button
variant="primary"
to="/onboarding/assign-tutorial"
className={classNames(
'xs:ml-auto',
CalibrationStatus.SUCCESS !== calibrationStatus && 'hidden'
)}
>
{l10n.getString('onboarding-continue')}
</Button>
<LoaderIcon slimeState={slimeStatus} />
</div>
<ProgressBar
progress={
isCounting
? (IMU_CALIBRATION_TIME - timer) / IMU_CALIBRATION_TIME
: calibrationStatus === CalibrationStatus.SUCCESS ||
calibrationStatus === CalibrationStatus.ERROR
? 1
: 0
}
height={14}
animated
colorClass={progressBarClass}
/>
</div>
<div className="flex justify-center">
<Typography variant="section-title">{progressText}</Typography>
</div>
<div className="flex gap-3 mobile:flex-col">
<Button
variant="secondary"
to="/onboarding/assign-tutorial"
className={classNames('xs:ml-auto', !skipButton && 'hidden')}
to="/onboarding/wifi-creds"
className="xs:mr-auto"
>
{l10n.getString('onboarding-calibration_tutorial-skip')}
{l10n.getString('onboarding-previous_step')}
</Button>
<Button
variant="primary"
onClick={() => {
setCalibrationStatus(CalibrationStatus.CALIBRATING);
startCountdown();
}}
disabled={isCounting || !rested}
className={classNames(
'xs:ml-auto',
CalibrationStatus.SUCCESS === calibrationStatus && 'hidden'
)}
>
{l10n.getString('onboarding-calibration_tutorial-calibrate')}
</Button>
<Button
variant="primary"
to="/onboarding/assign-tutorial"
className={classNames(
'xs:ml-auto',
CalibrationStatus.SUCCESS !== calibrationStatus && 'hidden'
)}
>
{l10n.getString('onboarding-continue')}
</Button>
</div>
<Button
variant="secondary"
to="/onboarding/assign-tutorial"
className={classNames('xs:ml-auto', !skipButton && 'hidden')}
>
{l10n.getString('onboarding-calibration_tutorial-skip')}
</Button>
</div>
<div className="mobile:hidden flex self-center w-[32rem] mobile:absolute">
<div className="stroke-none xs:fill-background-10 mobile:fill-background-50 mobile:blur-sm">
<TaybolIcon width="450"></TaybolIcon>
</div>
</div>
<div className="mobile:hidden flex self-center w-[32rem] mobile:absolute">
<div className="stroke-none xs:fill-background-10 mobile:fill-background-50 mobile:blur-sm">
<TaybolIcon width="450" />
</div>
</div>
</div>
</>
</div>
);
}
@@ -12,9 +12,9 @@
grid-template:
's t' var(--connect-tracker-layout-top)
's c' calc(100% - var(--connect-tracker-layout-top))
/ calc(var(--connect-tracker-layout-sidebar)) calc(100% - var(
--connect-tracker-layout-sidebar
));
/ calc(var(--connect-tracker-layout-sidebar)) calc(
100% - var(--connect-tracker-layout-sidebar)
);
@screen mobile {
grid-template:
@@ -27,6 +27,7 @@ import { BaseModal } from '@/components/commons/BaseModal';
import { useStatusContext } from '@/hooks/status-system';
import { A } from '@/components/commons/A';
import { CONNECT_TRACKER } from '@/utils/tauri';
import { uniqueNumberFromTracker } from '@/hooks/tracker';
const statusLabelMap = {
[WifiProvisioningStatus.NONE]:
@@ -140,7 +141,9 @@ export function ConnectTrackersPage() {
if (provisioningStatus === WifiProvisioningStatus.DONE) {
return 'bg-status-success';
}
}, [provisioningStatus]);
return undefined;
}, [isError, provisioningStatus]);
const slimeStatus = useMemo(() => {
if (isError) {
@@ -165,11 +168,13 @@ export function ConnectTrackersPage() {
[connectedIMUTrackers.length]
);
const filteredStatuses = useMemo(() => {
return Object.entries(statuses).filter(
([, value]) => value.dataType == StatusData.StatusPublicNetwork
);
}, [statuses]);
const filteredStatuses = useMemo(
() =>
Object.entries(statuses).filter(
([, value]) => value.dataType == StatusData.StatusPublicNetwork
),
[statuses]
);
return (
<>
@@ -189,21 +194,21 @@ export function ConnectTrackersPage() {
>
<div className="flex flex-col items-center gap-2 ">
<Localized id={(errorLabelMap as any)[provisioningStatus]}>
<Typography variant="main-title"></Typography>
<Typography variant="main-title" />
</Localized>
<Localized id={`${(errorLabelMap as any)[provisioningStatus]}-desc`}>
<Typography
variant="standard"
whitespace="whitespace-pre-wrap"
block
></Typography>
/>
</Localized>
<video
src={CONNECT_TRACKER}
loop
autoPlay
className="w-full aspect-video rounded-md mt-2"
></video>
/>
<div className="flex gap-3 pt-5 justify-end w-full">
<Button
variant="tertiary"
@@ -239,7 +244,7 @@ export function ConnectTrackersPage() {
</div>
<Localized
id={currentTip}
elems={{ em: <em className="italic"></em>, b: <b></b> }}
elems={{ em: <em className="italic" />, b: <b /> }}
>
<TipBox>Conditional tip</TipBox>
</Localized>
@@ -250,7 +255,7 @@ export function ConnectTrackersPage() {
id={`status_system-${StatusData[status.dataType]}`}
elems={{
PublicFixLink: (
<A href="https://docs.slimevr.dev/common-issues.html#network-profile-is-currently-set-to-public"></A>
<A href="https://docs.slimevr.dev/common-issues.html#network-profile-is-currently-set-to-public" />
),
}}
>
@@ -273,7 +278,7 @@ export function ConnectTrackersPage() {
'right-5 bottom-8'
)}
>
<LoaderIcon slimeState={slimeStatus}></LoaderIcon>
<LoaderIcon slimeState={slimeStatus} />
</div>
<div className="flex flex-col grow self-center">
@@ -288,9 +293,9 @@ export function ConnectTrackersPage() {
<ProgressBar
progress={statusProgressMap[provisioningStatus]}
height={14}
animated={true}
animated
colorClass={progressBarClass}
></ProgressBar>
/>
</div>
</div>
<div className="flex flex-row mt-4 gap-3">
@@ -330,22 +335,22 @@ export function ConnectTrackersPage() {
{Array.from({
...connectedIMUTrackers,
length: Math.max(connectedIMUTrackers.length, 1),
}).map((tracker, index) => (
<div key={index}>
}).map((tracker) => (
<div key={uniqueNumberFromTracker(tracker.tracker)}>
{!tracker && (
<div
className={classNames(
'rounded-xl h-16 animate-pulse',
state.alonePage ? 'bg-background-80' : 'bg-background-70'
)}
></div>
/>
)}
{tracker && (
<TrackerCard
tracker={tracker.tracker}
device={tracker.device}
smol
></TrackerCard>
/>
)}
</div>
))}
@@ -30,21 +30,21 @@ function Error({ title, desc }: { title: string; desc: string }) {
return (
<>
<LoaderIcon slimeState={SlimeState.SAD} size={200}></LoaderIcon>
<LoaderIcon slimeState={SlimeState.SAD} size={200} />
<div>
<Localized id={title}>
<Typography variant="main-title"></Typography>
<Typography variant="main-title" />
</Localized>
<Localized id={desc}>
<Typography variant="standard"></Typography>
<Typography variant="standard" />
</Localized>
{isTauri && (
<div className="flex gap-2 justify-center mt-4">
<Localized id="websocket-error-close">
<Button variant="primary" onClick={closeApp}></Button>
<Button variant="primary" onClick={closeApp} />
</Localized>
<Localized id="websocket-error-logs">
<Button variant="secondary" onClick={openLogsFolder}></Button>
<Button variant="secondary" onClick={openLogsFolder} />
</Localized>
</div>
)}
@@ -65,10 +65,10 @@ export function ConnectionLost() {
<div className="flex flex-col items-center gap-4 -mt-12">
{isLoading && (
<>
<LoaderIcon slimeState={SlimeState.JUMPY} size={200}></LoaderIcon>
<LoaderIcon slimeState={SlimeState.JUMPY} size={200} />
<div>
<Localized id="websocket-connecting">
<Typography variant="main-title"></Typography>
<Typography variant="main-title" />
</Localized>
</div>
</>
@@ -77,13 +77,10 @@ export function ConnectionLost() {
<Error
title="websocket-connection_lost"
desc="websocket-connection_lost-desc"
></Error>
/>
)}
{isTimedOut && (
<Error
title="websocket-timedout"
desc="websocket-timedout-desc"
></Error>
<Error title="websocket-timedout" desc="websocket-timedout-desc" />
)}
</div>
</div>
+1 -1
View File
@@ -15,7 +15,7 @@ export function DonePage() {
return (
<div className="flex flex-col gap-5 h-full items-center w-full justify-center">
<div className="flex flex-col gap-5 items-center z-10">
<SlimeVRIcon></SlimeVRIcon>
<SlimeVRIcon />
<Typography variant="main-title">
{l10n.getString('onboarding-done-title')}
</Typography>
+28 -30
View File
@@ -11,39 +11,37 @@ export function EnterVRPage() {
applyProgress(0.6);
return (
<>
<div className="flex flex-col gap-5 h-full items-center w-full justify-center">
<div className="flex flex-col w-full h-full justify-center items-center">
<div className="flex gap-8">
<div className="flex flex-col max-w-md gap-3">
<ArrowLink to="/onboarding/trackers-assign" direction="left">
{l10n.getString('onboarding-enter_vr-back')}
</ArrowLink>
<Typography variant="main-title">
{l10n.getString('onboarding-enter_vr-title')}
</Typography>
<Typography color="secondary">
{l10n.getString('onboarding-enter_vr-description')}
</Typography>
</div>
{/* <div className="flex flex-col flex-grow gap-3 rounded-xl fill-background-50">
<div className="flex flex-col gap-5 h-full items-center w-full justify-center">
<div className="flex flex-col w-full h-full justify-center items-center">
<div className="flex gap-8">
<div className="flex flex-col max-w-md gap-3">
<ArrowLink to="/onboarding/trackers-assign" direction="left">
{l10n.getString('onboarding-enter_vr-back')}
</ArrowLink>
<Typography variant="main-title">
{l10n.getString('onboarding-enter_vr-title')}
</Typography>
<Typography color="secondary">
{l10n.getString('onboarding-enter_vr-description')}
</Typography>
</div>
{/* <div className="flex flex-col flex-grow gap-3 rounded-xl fill-background-50">
<Typography variant="main-title">Illustration HERE</Typography>
</div> */}
</div>
</div>
<div className="w-full py-4 flex flex-row">
<div className="flex flex-grow">
<Button variant="secondary" to="/" onClick={skipSetup}>
{l10n.getString('onboarding-skip')}
</Button>
</div>
<div className="flex gap-3">
<Button variant="primary" to="/onboarding/mounting/auto">
{l10n.getString('onboarding-enter_vr-ready')}
</Button>
</div>
</div>
</div>
</>
<div className="w-full py-4 flex flex-row">
<div className="flex flex-grow">
<Button variant="secondary" to="/" onClick={skipSetup}>
{l10n.getString('onboarding-skip')}
</Button>
</div>
<div className="flex gap-3">
<Button variant="primary" to="/onboarding/mounting/auto">
{l10n.getString('onboarding-enter_vr-ready')}
</Button>
</div>
</div>
</div>
);
}
+41 -43
View File
@@ -12,49 +12,47 @@ export function HomePage() {
applyProgress(0.1);
return (
<>
<div className="flex relative flex-col gap-5 h-full items-center w-full justify-center px-4 overflow-clip">
<div className="flex flex-col gap-5 items-center z-10 scale-150 mb-20">
<SlimeVRIcon></SlimeVRIcon>
<Typography variant="mobile-title">
{l10n.getString('onboarding-home')}
</Typography>
<Button variant="primary" to="/onboarding/wifi-creds">
{l10n.getString('onboarding-home-start')}
</Button>
</div>
<div className="absolute right-4 bottom-4 z-50">
<LangSelector />
</div>
<div
className="absolute bg-accent-background-50 w-full rounded-full"
style={{
bottom: 'calc(-300vw / 1.04)',
height: '300vw',
width: '300vw',
}}
></div>
<img
className="absolute"
src="/images/slime-girl.webp"
style={{
width: '35%',
maxWidth: 800,
bottom: '1%',
left: '9%',
}}
/>
<img
className="absolute"
src="/images/slimes.webp"
style={{
width: '35%',
maxWidth: 800,
bottom: '1%',
right: '9%',
}}
/>
<div className="flex relative flex-col gap-5 h-full items-center w-full justify-center px-4 overflow-clip">
<div className="flex flex-col gap-5 items-center z-10 scale-150 mb-20">
<SlimeVRIcon />
<Typography variant="mobile-title">
{l10n.getString('onboarding-home')}
</Typography>
<Button variant="primary" to="/onboarding/wifi-creds">
{l10n.getString('onboarding-home-start')}
</Button>
</div>
</>
<div className="absolute right-4 bottom-4 z-50">
<LangSelector />
</div>
<div
className="absolute bg-accent-background-50 w-full rounded-full"
style={{
bottom: 'calc(-300vw / 1.04)',
height: '300vw',
width: '300vw',
}}
/>
<img
className="absolute"
src="/images/slime-girl.webp"
style={{
width: '35%',
maxWidth: 800,
bottom: '1%',
left: '9%',
}}
/>
<img
className="absolute"
src="/images/slimes.webp"
style={{
width: '35%',
maxWidth: 800,
bottom: '1%',
right: '9%',
}}
/>
</div>
);
}
Loaded 100 of 214 files, more files were not shown because too many files have changed in this diff. Show more