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: add gems #168

Merged
merged 21 commits into from
Aug 29, 2024
Merged
Show file tree
Hide file tree
Changes from 13 commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
f3309ad
feat(airdrop): airdrop auth get tokens (#95)
PanchoBubble Aug 27, 2024
1338623
chore(sync): update gems branch (#165)
BalazsSevecsek Aug 27, 2024
205e828
feat(gems): add heartbeat signal (#159)
BalazsSevecsek Aug 27, 2024
b912a7d
fix: fixes eslint bug (#172)
PanchoBubble Aug 27, 2024
16c9446
Merge branch 'main' into feature/gems
BalazsSevecsek Aug 27, 2024
36df699
Change telemetry data.
BalazsSevecsek Aug 28, 2024
1e122fc
fix: alter telemetry url to use real server
BalazsSevecsek Aug 28, 2024
48dac07
feat(airdrop): user token integration (#191)
PanchoBubble Aug 28, 2024
98b6d2e
fix: access token update
BalazsSevecsek Aug 28, 2024
d479290
Merge branch 'main' into feature/gems
PanchoBubble Aug 28, 2024
134660d
fix: linting adjustments (#210)
PanchoBubble Aug 28, 2024
de667b3
fix: removes undefined variable
PanchoBubble Aug 28, 2024
b62dbd4
Merge remote-tracking branch 'prod/feature/gems' into HEAD
PanchoBubble Aug 28, 2024
889c043
fix: delete icons.icns
BalazsSevecsek Aug 29, 2024
d35bf20
fix: Add back proper icon.icns file.
BalazsSevecsek Aug 29, 2024
88a50d9
fix: update theme tokens
PanchoBubble Aug 29, 2024
a7077a1
fix: removes duplicated code
PanchoBubble Aug 29, 2024
598b528
fix: issues around telemetry_manager
BalazsSevecsek Aug 29, 2024
3fe2e4c
Merge remote-tracking branch 'prod/main' into HEAD
PanchoBubble Aug 29, 2024
a2e3bf0
Merge remote-tracking branch 'prod/feature/gems' into HEAD
PanchoBubble Aug 29, 2024
8512637
Merge remote-tracking branch 'prod/main' into HEAD
PanchoBubble Aug 29, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .nvmrc
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
v20.17.0
151 changes: 143 additions & 8 deletions package-lock.json

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

4 changes: 3 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
"react-dom": "^18.2.0",
"react-hook-form": "^7.52.2",
"react-icons": "^5.3.0",
"uuid": "^10.0.0",
"vite-tsconfig-paths": "^5.0.1",
"zustand": "^4.5.5"
},
Expand All @@ -34,7 +35,8 @@
"@types/node": "^22.5.1",
"@types/react": "^18.3.4",
"@types/react-dom": "^18.2.7",
"@typescript-eslint/parser": "^8.1.0",
"@types/uuid": "^10.0.0",
"@typescript-eslint/parser": "8.2.0",
"@vitejs/plugin-react": "^4.2.1",
"eslint": "^9.9.0",
"eslint-config-prettier": "^9.1.0",
Expand Down
30 changes: 30 additions & 0 deletions src-tauri/Cargo.lock

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

1 change: 1 addition & 0 deletions src-tauri/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ edition = "2021"
tauri-build = { version = "1", features = ["isolation"] }

[dependencies]
jsonwebtoken = "9.3.0"
tari_common = { git = "https://github.com/tari-project/tari.git", branch = "development" }
tari_common_types = { git = "https://github.com/tari-project/tari.git", branch = "development" }
tari_shutdown = { git = "https://github.com/tari-project/tari.git", branch = "development" }
Expand Down
Binary file modified src-tauri/icons/icon.icns
Binary file not shown.
1 change: 1 addition & 0 deletions src-tauri/rust-toolchain
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
1.80.0
Loading