From 80c787549c471bec7c9f2ef314f8be02ee51b5ae Mon Sep 17 00:00:00 2001 From: Alexander Date: Sat, 8 Jul 2023 18:47:59 +0300 Subject: [PATCH 1/2] fix: UX issues + ESLint warnings (#2) * Fix UX issues, fix ESLint warnings, use accent color more - Make main window larger so modal fits - overflow: hidden on html to remove jitter during modal animation - Proper spacing for the simvars menu - Use accent color on the buttons and rings - Close modal on Esc and outside click - Show feedback error when project already exists - Add instruction how to add instruments - Add window title * chore: Bump deps to latest, update README.md * minor visual/style adjustments * chore: Drop yarn, update README, simplify modal close * Remove explicit `useCapture` argument * Drop event consts, fix modal outside click closing * fix modal onclose action * fix eslint errors --------- Co-authored-by: Michael Romashov --- README.md | 13 +- index.html | 2 +- package-lock.json | 5273 ++++---------------- package.json | 51 +- src-tauri/src/watcher.rs | 2 +- src-tauri/tauri.conf.json | 8 +- src/components/Card.tsx | 2 +- src/components/Input.tsx | 10 +- src/components/Instrument.tsx | 9 +- src/components/contextmenu/CanvasMenu.tsx | 12 +- src/components/contextmenu/ElementMenu.tsx | 6 +- src/components/menu/ElementsMenu.tsx | 13 +- src/components/menu/SimVarsMenu.tsx | 7 +- src/components/menu/index.tsx | 54 +- src/components/modal/NewProjectModal.tsx | 22 +- src/components/modal/index.tsx | 22 +- src/index.css | 4 + src/index.tsx | 12 +- src/pages/Home.tsx | 21 +- src/pages/Workspace.tsx | 6 +- src/redux/global/configSlice.ts | 12 +- src/redux/workspace/contextMenuSlice.ts | 6 +- src/redux/workspace/projectSlice.ts | 2 +- src/redux/workspace/simVarSlice.ts | 7 +- src/shims/Coherent.ts | 3 +- src/shims/MsfsSdk.ts | 2 + src/shims/fetch.ts | 4 +- src/shims/index.ts | 6 +- vite.config.ts | 3 +- 29 files changed, 1092 insertions(+), 4502 deletions(-) diff --git a/README.md b/README.md index 102e366..1dc0c7d 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,12 @@ -# Tauri + React + Typescript +# ACE v3 +The third iteration of the Advanced Cockpit Emulator. -This template should help get you started developing with Tauri, React and Typescript in Vite. +## Installation and usage +1. [Install Rust and toolchain](https://tauri.app/v1/guides/getting-started/prerequisites) +2. Clone the repo and `cd` into it +3. `npm i` +4. `npm start` -## Recommended IDE Setup +## Recommended IDE Setup for development -- [VS Code](https://code.visualstudio.com/) + [Tauri](https://marketplace.visualstudio.com/items?itemName=tauri-apps.tauri-vscode) + [rust-analyzer](https://marketplace.visualstudio.com/items?itemName=rust-lang.rust-analyzer) +- [VS Code](https://code.visualstudio.com) + [Tauri](https://marketplace.visualstudio.com/items?itemName=tauri-apps.tauri-vscode) + [rust-analyzer](https://marketplace.visualstudio.com/items?itemName=rust-lang.rust-analyzer) diff --git a/index.html b/index.html index 2e833f6..f1ff052 100644 --- a/index.html +++ b/index.html @@ -11,7 +11,7 @@
- + Advanced Cockpit Emulator