From e1735279b57aa606da03e46dce0e1fdd58871252 Mon Sep 17 00:00:00 2001 From: nakajimayoshi Date: Tue, 11 Jul 2023 16:20:42 +0900 Subject: [PATCH 01/13] squash commits --- README.md | 13 +- index.html | 2 +- package-lock.json | 5273 ++++---------------- package.json | 51 +- postcss.config.cjs | 11 +- src-tauri/src/watcher.rs | 2 +- src-tauri/tauri.conf.json | 8 +- src/components/Button.tsx | 2 +- src/components/Card.tsx | 5 +- src/components/Input.tsx | 18 +- src/components/Instrument.tsx | 17 +- src/components/contextmenu/CanvasMenu.tsx | 14 +- src/components/contextmenu/ElementMenu.tsx | 8 +- src/components/contextmenu/index.tsx | 2 +- src/components/menu/ElementsMenu.tsx | 23 +- src/components/menu/SettingsMenu.tsx | 26 + src/components/menu/SimVarsMenu.tsx | 17 +- src/components/menu/ThemeButton.tsx | 63 + src/components/menu/index.tsx | 54 +- src/components/modal/NewProjectModal.tsx | 22 +- src/components/modal/index.tsx | 26 +- src/index.css | 146 +- src/index.tsx | 15 +- src/pages/Home.tsx | 58 +- src/pages/Settings.tsx | 37 + src/pages/Workspace.tsx | 15 +- src/redux/global/configSlice.ts | 48 +- src/redux/global/index.ts | 4 +- src/redux/global/ui/colors.ts | 45 + src/redux/global/ui/uitheme.ts | 21 + 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 +- tailwind.config.cjs | 58 +- vite.config.ts | 3 +- 39 files changed, 1554 insertions(+), 4583 deletions(-) create mode 100644 src/components/menu/SettingsMenu.tsx create mode 100644 src/components/menu/ThemeButton.tsx create mode 100644 src/pages/Settings.tsx create mode 100644 src/redux/global/ui/colors.ts create mode 100644 src/redux/global/ui/uitheme.ts 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