Mirror/robosats
1
0
Fork 0
mirror of https://github.com/RoboSats/robosats.git synced 2025-01-18 12:11:35 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add .dockerignore. Fix profile button tooltip.

Browse Source
This commit is contained in:
Reckless_Satoshi 2022-06-20 11:48:42 -07:00
parent 6f7cfb5147
commit 139afb47a5
No known key found for this signature in database
GPG Key ID: 9C4585B561315571
3 changed files with 23 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
.dockerignore Normal file
View File

@ -0,0 +1,12 @@
db
docs
docker
.editorconfig
.env-sample
CONTRIBUTING.md
django
README.md
setup.md
docker-compose.yml
.github
.git

4
frontend/src/components/BottomBar.js
View File

@ -140,7 +140,7 @@ bottomBarDesktop =()=>{
<div style={{display: this.showProfileButton() ? '':'none'}}>
<ListItemButton onClick={this.handleClickOpenProfile} >
<Tooltip
open={hasRewards || hasOrder}
open={(hasRewards || hasOrder) && this.showProfileButton()}
title={(hasRewards ? t("You can claim satoshis!")+" ": "" )+
(hasOrder ? t("You have an active order"):"")}
>
@ -333,7 +333,7 @@ bottomBarPhone =()=>{
<Grid item xs={1.6}>
<div style={{display: this.showProfileButton() ? '':'none'}}>
<Tooltip open={hasRewards || hasOrder}
<Tooltip open={(hasRewards || hasOrder) && this.showProfileButton()}
title={(hasRewards ? t("You can claim satoshis!")+" ": "" )+
(hasOrder ? t("You have an active order"):"")}>
<IconButton onClick={this.handleClickOpenProfile} sx={{margin: 0, bottom: 17, right: 8}} >

13
frontend/src/components/UserGenPage.js
View File

@ -38,7 +38,7 @@ class UserGenPage extends Component {
this.setState({
nickname: this.props.nickname,
token: this.props.token? this.props.token : "",
avatar_url: '/static/assets/avatars/' + this.props.nickname + '.png',
avatarUrl: '/static/assets/avatars/' + this.props.nickname + '.png',
loadingRobot: false
});
}
@ -81,7 +81,7 @@ class UserGenPage extends Component {
this.setState({
nickname: data.nickname,
bit_entropy: data.token_bits_entropy,
avatar_url: '/static/assets/avatars/' + data.nickname + '.png',
avatarUrl: '/static/assets/avatars/' + data.nickname + '.png',
shannon_entropy: data.token_shannon_entropy,
bad_request: data.bad_request,
found: data.found,
@ -146,7 +146,12 @@ class UserGenPage extends Component {
this.delGeneratedUser();
this.getGeneratedUser(this.state.token);
this.setState({loadingRobot: true, tokenHasChanged: false});
this.props.setAppState({avatarLoaded: false, nickname: null, token: null, copiedToken: false});
this.props.setAppState({avatarLoaded: false,
nickname: null,
token: null,
copiedToken: false,
lastOrderId: null,
activeOrderId: null});
}
handleClickOpenInfo = () => {
@ -194,7 +199,7 @@ class UserGenPage extends Component {
disableError={true}
cover={true}
color='null'
src={getCookie("sessionid") ? this.state.avatar_url || "" : ""}
src={getCookie("sessionid") ? this.state.avatarUrl || "" : ""}
/>
</div>
</Tooltip><br/>