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.

Sign up for GitHub

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 file uploading to ipfs for asset create #3524

Merged
merged 1 commit into from
Nov 2, 2021
Merged

feat: add file uploading to ipfs for asset create #3524

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
16 changes: 11 additions & 5 deletions applications/tari_collectibles/src-tauri/src/wallet_client.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,11 +37,17 @@ impl WalletClient {
}

pub async fn connect(&mut self) -> Result<(), String> {
self.inner = Some(
grpc::wallet_client::WalletClient::connect(format!("http://{}", self.endpoint))
.await
.unwrap(),
);
let dst = format!("http://{}", self.endpoint);
let client = grpc::wallet_client::WalletClient::connect(dst)
.await
.map_err(|err| {
format!(
"No connection to wallet. Is it running with grpc on '{}' ? Error: {}",
self.endpoint, err
)
})?;

self.inner = Some(client);
Ok(())
}

Expand Down
5 changes: 5 additions & 0 deletions applications/tari_collectibles/web-app/package-lock.json
View file
Open in desktop

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

5 changes: 3 additions & 2 deletions applications/tari_collectibles/web-app/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,16 @@
"@emotion/styled": "^11.3.0",
"@mui/icons-material": "^5.0.3",
"@mui/material": "^5.0.3",
"@tauri-apps/api": "^1.0.0-beta.8",
"@testing-library/jest-dom": "^5.14.1",
"@testing-library/react": "^11.2.7",
"@testing-library/user-event": "^12.8.3",
"magic-bytes.js": "^1.0.3",
"react": "^17.0.2",
"react-dom": "^17.0.2",
"react-router-dom": "^5.3.0",
"react-scripts": "4.0.3",
"web-vitals": "^1.1.2",
"@tauri-apps/api": "^1.0.0-beta.8"
"web-vitals": "^1.1.2"
},
"scripts": {
"start": "react-scripts start",
Expand Down
Loading