mirror of
https://github.com/RoboSats/robosats.git
synced 2024-10-26 23:43:34 +03:00
Add .dockerignore. Fix profile button tooltip.
This commit is contained in:
parent
6f7cfb5147
commit
139afb47a5
12
.dockerignore
Normal file
12
.dockerignore
Normal file
@ -0,0 +1,12 @@
|
|||||||
|
db
|
||||||
|
docs
|
||||||
|
docker
|
||||||
|
.editorconfig
|
||||||
|
.env-sample
|
||||||
|
CONTRIBUTING.md
|
||||||
|
django
|
||||||
|
README.md
|
||||||
|
setup.md
|
||||||
|
docker-compose.yml
|
||||||
|
.github
|
||||||
|
.git
|
@ -140,7 +140,7 @@ bottomBarDesktop =()=>{
|
|||||||
<div style={{display: this.showProfileButton() ? '':'none'}}>
|
<div style={{display: this.showProfileButton() ? '':'none'}}>
|
||||||
<ListItemButton onClick={this.handleClickOpenProfile} >
|
<ListItemButton onClick={this.handleClickOpenProfile} >
|
||||||
<Tooltip
|
<Tooltip
|
||||||
open={hasRewards || hasOrder}
|
open={(hasRewards || hasOrder) && this.showProfileButton()}
|
||||||
title={(hasRewards ? t("You can claim satoshis!")+" ": "" )+
|
title={(hasRewards ? t("You can claim satoshis!")+" ": "" )+
|
||||||
(hasOrder ? t("You have an active order"):"")}
|
(hasOrder ? t("You have an active order"):"")}
|
||||||
>
|
>
|
||||||
@ -333,7 +333,7 @@ bottomBarPhone =()=>{
|
|||||||
|
|
||||||
<Grid item xs={1.6}>
|
<Grid item xs={1.6}>
|
||||||
<div style={{display: this.showProfileButton() ? '':'none'}}>
|
<div style={{display: this.showProfileButton() ? '':'none'}}>
|
||||||
<Tooltip open={hasRewards || hasOrder}
|
<Tooltip open={(hasRewards || hasOrder) && this.showProfileButton()}
|
||||||
title={(hasRewards ? t("You can claim satoshis!")+" ": "" )+
|
title={(hasRewards ? t("You can claim satoshis!")+" ": "" )+
|
||||||
(hasOrder ? t("You have an active order"):"")}>
|
(hasOrder ? t("You have an active order"):"")}>
|
||||||
<IconButton onClick={this.handleClickOpenProfile} sx={{margin: 0, bottom: 17, right: 8}} >
|
<IconButton onClick={this.handleClickOpenProfile} sx={{margin: 0, bottom: 17, right: 8}} >
|
||||||
|
@ -38,7 +38,7 @@ class UserGenPage extends Component {
|
|||||||
this.setState({
|
this.setState({
|
||||||
nickname: this.props.nickname,
|
nickname: this.props.nickname,
|
||||||
token: this.props.token? this.props.token : "",
|
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
|
loadingRobot: false
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
@ -81,7 +81,7 @@ class UserGenPage extends Component {
|
|||||||
this.setState({
|
this.setState({
|
||||||
nickname: data.nickname,
|
nickname: data.nickname,
|
||||||
bit_entropy: data.token_bits_entropy,
|
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,
|
shannon_entropy: data.token_shannon_entropy,
|
||||||
bad_request: data.bad_request,
|
bad_request: data.bad_request,
|
||||||
found: data.found,
|
found: data.found,
|
||||||
@ -146,7 +146,12 @@ class UserGenPage extends Component {
|
|||||||
this.delGeneratedUser();
|
this.delGeneratedUser();
|
||||||
this.getGeneratedUser(this.state.token);
|
this.getGeneratedUser(this.state.token);
|
||||||
this.setState({loadingRobot: true, tokenHasChanged: false});
|
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 = () => {
|
handleClickOpenInfo = () => {
|
||||||
@ -194,7 +199,7 @@ class UserGenPage extends Component {
|
|||||||
disableError={true}
|
disableError={true}
|
||||||
cover={true}
|
cover={true}
|
||||||
color='null'
|
color='null'
|
||||||
src={getCookie("sessionid") ? this.state.avatar_url || "" : ""}
|
src={getCookie("sessionid") ? this.state.avatarUrl || "" : ""}
|
||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
</Tooltip><br/>
|
</Tooltip><br/>
|
||||||
|
Loading…
Reference in New Issue
Block a user