Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: Send progress events from Host to Guest #10

Merged
merged 10 commits into from
Aug 26, 2024
23 changes: 16 additions & 7 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 0 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,3 @@ This is the monorepo containing the source code for all of our core projects:
- and other crates we use in our binaries

If you're just here for the software, head over to the [releases](https://github.com/UnstoppableSwap/xmr-btc-swap/releases/latest) tab and grab the binary for your operating system! If you're just looking for documentation, check out our [docs page](https://docs.unstoppableswap.net/) or our [github docs](docs/README.md).

If you are looking for help or encountered an issue, feel free to open an issue.
3 changes: 2 additions & 1 deletion dprint.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
"plugins": [
"https://plugins.dprint.dev/markdown-0.13.1.wasm",
"https://github.com/thomaseizinger/dprint-plugin-cargo-toml/releases/download/0.1.0/cargo-toml-0.1.0.wasm",
"https://plugins.dprint.dev/exec-0.3.5.json@d687dda57be0fe9a0088ccdaefa5147649ff24127d8b3ea227536c68ee7abeab"
"https://plugins.dprint.dev/exec-0.3.5.json@d687dda57be0fe9a0088ccdaefa5147649ff24127d8b3ea227536c68ee7abeab",
"https://plugins.dprint.dev/prettier-0.26.6.json@0118376786f37496e41bb19dbcfd1e7214e2dc859a55035c5e54d1107b4c9c57"
]
}
2 changes: 1 addition & 1 deletion rust-toolchain.toml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
[toolchain]
channel = "1.74" # also update this in the readme, changelog, and github actions
channel = "1.80" # also update this in the readme, changelog, and github actions
components = ["clippy"]
targets = ["armv7-unknown-linux-gnueabihf"]
6 changes: 6 additions & 0 deletions src-gui/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,9 @@ This template should help get you started developing with Tauri, React and Types
## Recommended IDE Setup

- [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)

## Generate bindings for Tauri API

```bash
typeshare --lang=typescript --output-file ./src/models/tauriModel.ts ../swap/src
```
20 changes: 20 additions & 0 deletions src-gui/eslint.config.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
import globals from "globals";
import pluginJs from "@eslint/js";
import tseslint from "typescript-eslint";
import pluginReact from "eslint-plugin-react";

export default [
{
ignores: ["node_modules", "dist"],
},
pluginJs.configs.recommended,
...tseslint.configs.recommended,
pluginReact.configs.flat.recommended,
{
files: ["**/*.{js,mjs,cjs,ts,jsx,tsx}"],
languageOptions: { globals: globals.browser },
rules: {
"react/react-in-jsx-scope": "off",
},
},
];
8 changes: 6 additions & 2 deletions src-gui/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,7 @@
"@material-ui/icons": "^4.11.3",
"@material-ui/lab": "^4.0.0-alpha.61",
"@reduxjs/toolkit": "^2.2.6",
"@tauri-apps/api": ">=2.0.0-beta.0",
"@tauri-apps/plugin-shell": ">=2.0.0-beta.0",
"@tauri-apps/api": "2.0.0-rc.1",
"humanize-duration": "^3.32.1",
"lodash": "^4.17.21",
"multiaddr": "^10.0.1",
Expand All @@ -31,6 +30,7 @@
"virtua": "^0.33.2"
},
"devDependencies": {
"@eslint/js": "^9.9.0",
"@tauri-apps/cli": ">=2.0.0-beta.0",
"@types/humanize-duration": "^3.27.4",
"@types/lodash": "^4.17.6",
Expand All @@ -39,8 +39,12 @@
"@types/react-dom": "^18.2.7",
"@types/semver": "^7.5.8",
"@vitejs/plugin-react": "^4.2.1",
"eslint": "^9.9.0",
"eslint-plugin-react": "^7.35.0",
"globals": "^15.9.0",
"internal-ip": "^7.0.0",
"typescript": "^5.2.2",
"typescript-eslint": "^8.1.0",
"vite": "^5.3.1",
"vite-tsconfig-paths": "^4.3.2"
}
Expand Down
Loading
Loading