RoboSats/robosats
1
1
Fork 0
mirror of https://github.com/RoboSats/robosats.git synced 2024-12-26 05:43:34 +03:00
Code Issues Packages Projects Releases Wiki Activity

Route refCode url to api/user and display rewards

Browse Source
This commit is contained in:
Reckless_Satoshi 2022-03-05 09:32:27 -08:00
parent a11419395f
commit dea2b665fb
No known key found for this signature in database
GPG Key ID: 9C4585B561315571
9 changed files with 63 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
api/models.py
View File

@ -405,6 +405,24 @@ class Profile(models.Model):
default=False,
null=False
)
# Referral program
is_referred = models.BooleanField(
default=False,
null=False
)
referral_code = models.CharField(
max_length=15,
null=True,
blank=True
)
# Recent rewards from referred trades that will be "earned" at a later point to difficult spionage.
pending_rewards = models.PositiveIntegerField(null=False, default=0)
# Claimable rewards
earned_rewards = models.PositiveIntegerField(null=False, default=0)
# Total claimed rewards
claimed_rewarded = models.PositiveIntegerField(null=False, default=0)
# Disputes
num_disputes = models.PositiveIntegerField(null=False, default=0)
lost_disputes = models.PositiveIntegerField(null=False, default=0)

4
api/views.py
View File

@ -13,6 +13,7 @@ from api.serializers import ListOrderSerializer, MakeOrderSerializer, UpdateOrde
from api.models import LNPayment, MarketTick, Order, Currency
from api.logics import Logics
from api.messages import Telegram
from secrets import token_urlsafe
from api.utils import get_lnd_version, get_commit_robosats, compute_premium_percentile
from .nick_generator.nick_generator import NickGenerator
@ -521,6 +522,7 @@ class UserView(APIView):
is_staff=False)
user = authenticate(request, username=nickname, password=token)
user.profile.avatar = "static/assets/avatars/" + nickname + ".png"
#user.profile.referral_code = token_urlsafe(8)
login(request, user)
return Response(context, status=status.HTTP_201_CREATED)
@ -637,7 +639,7 @@ class InfoView(ListAPIView):
status=Order.Status.PUB))
context["book_liquidity"] = Order.objects.filter(status=Order.Status.PUB).aggregate(Sum('last_satoshis'))['last_satoshis__sum']
context["book_liquidity"] = 0 if context["book_liquidity"] == None else context["book_liquidity"]
# Number of active users (logged in in last 30 minutes)
today = datetime.today()
context["active_robots_today"] = len(

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

@ -1,5 +1,5 @@
import React, { Component } from 'react'
import {Badge, Tooltip, TextField, ListItemAvatar, Avatar,Paper, Grid, IconButton, Typography, Select, MenuItem, List, ListItemText, ListItem, ListItemIcon, ListItemButton, Divider, Dialog, DialogContent} from "@mui/material";
import {Badge, Tooltip, TextField, ListItemAvatar, Button, Avatar,Paper, Grid, IconButton, Typography, Select, MenuItem, List, ListItemText, ListItem, ListItemIcon, ListItemButton, Divider, Dialog, DialogContent} from "@mui/material";
import MediaQuery from 'react-responsive'
import { Link } from 'react-router-dom'
@ -23,6 +23,7 @@ import DnsIcon from '@mui/icons-material/Dns';
import WebIcon from '@mui/icons-material/Web';
import BookIcon from '@mui/icons-material/Book';
import PersonAddAltIcon from '@mui/icons-material/PersonAddAlt';
import EmojiEventsIcon from '@mui/icons-material/EmojiEvents';
// pretty numbers
function pn(x) {
@ -56,6 +57,8 @@ export default class BottomBar extends Component {
profileShown: false,
alternative_site: 'robosats...',
node_id: '00000000',
referral_link: 'No referral link',
earned_rewards: 0,
};
this.getInfo();
}
@ -275,13 +278,13 @@ export default class BottomBar extends Component {
{this.props.token ?
<TextField
disabled
label='Store safely'
label='Store Safely'
value={this.props.token }
variant='filled'
size='small'
InputProps={{
endAdornment:
<Tooltip disableHoverListener open={this.state.copied} enterTouchDelay="0" title="Copied!">
<Tooltip disableHoverListener enterTouchDelay="0" title="Copied!">
<IconButton onClick= {()=>navigator.clipboard.writeText(this.props.token)}>
<ContentCopy />
</IconButton>
@ -300,15 +303,14 @@ export default class BottomBar extends Component {
</ListItemIcon>
<ListItemText secondary="Your referral link">
<TextField
label='Share to earn satoshis'
// value={this.props.referral_link}
value={'LINKKKKKKK732hcd23j98j2iuwh78c2i3jd9cy2hiudn8723ihdcniu2hdci23923jiuxjw'}
label='Share to Earn Satoshis'
value={this.state.referral_link}
// variant='filled'
size='small'
InputProps={{
endAdornment:
<Tooltip disableHoverListener open={this.state.copied} enterTouchDelay="0" title="Copied!">
<IconButton onClick= {()=>navigator.clipboard.writeText('LINKKKKKKK732hcd23j98j2iuwh78c2i3jd9cy2hiudn8723ihdcniu2hdci23923jiuxjw')}>
<Tooltip disableHoverListener enterTouchDelay="0" title="Copied!">
<IconButton onClick= {()=>navigator.clipboard.writeText(this.state.referral_link)}>
<ContentCopy />
</IconButton>
</Tooltip>,
@ -316,6 +318,24 @@ export default class BottomBar extends Component {
/>
</ListItemText>
</ListItem>
<ListItem>
<ListItemIcon>
<EmojiEventsIcon/>
</ListItemIcon>
<ListItemText secondary="Your earned rewards">
<Grid container xs={12}>
<Grid item xs={9}>
<Typography>{this.state.earned_rewards+" Sats"}</Typography>
</Grid>
<Grid item xs={3}>
{/* WIP: BUTTON ALWAYS DISABLED <Button disabled={this.state.earned_rewards==0? true : false} variant="contained" size="small">Claim</Button> */}
<Button disabled={this.state.earned_rewards==0? true : true} variant="contained" size="small">Claim</Button>
</Grid>
</Grid>
</ListItemText>
</ListItem>
</List>
</DialogContent>

3
frontend/src/components/HomePage.js
View File

@ -30,7 +30,8 @@ export default class HomePage extends Component {
<Router >
<div className='appCenter'>
<Switch>
<Route exact path='/' render={(props) => <UserGenPage {...this.state} setAppState={this.setAppState}/>}/>
<Route exact path='/' render={(props) => <UserGenPage {...props} {...this.state} setAppState={this.setAppState}/>}/>
<Route path='/ref/:refCode' render={(props) => <UserGenPage {...props} {...this.state} setAppState={this.setAppState}/>}/>
<Route path='/make' component={MakerPage}/>
<Route path='/book' component={BookPage}/>
<Route path="/order/:orderId" component={OrderPage}/>

2
frontend/src/components/MakerPage.js
View File

@ -1,5 +1,5 @@
import React, { Component } from 'react';
import { Tooltip, Paper, Button , Grid, Typography, TextField, Select, FormHelperText, MenuItem, FormControl, Radio, FormControlLabel, RadioGroup, dividerClasses} from "@mui/material"
import { Tooltip, Paper, Button , Grid, Typography, TextField, Select, FormHelperText, MenuItem, FormControl, Radio, FormControlLabel, RadioGroup} from "@mui/material"
import { Link } from 'react-router-dom'
import getFlags from './getFlags'

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

@ -32,7 +32,7 @@ export default class UserGenPage extends Component {
tokenHasChanged: false,
};
//this.props.setAppState({avatarLoaded: false, nickname: null, token: null});
this.refCode = this.props.match.params.refCode;
// Checks in parent HomePage if there is already a nick and token
// Displays the existing one
@ -40,7 +40,7 @@ export default class UserGenPage extends Component {
this.state = {
nickname: this.props.nickname,
token: this.props.token? this.props.token : null,
avatar_url: 'static/assets/avatars/' + this.props.nickname + '.png',
avatar_url: '/static/assets/avatars/' + this.props.nickname + '.png',
loadingRobot: false
}
}
@ -56,6 +56,7 @@ export default class UserGenPage extends Component {
// sort of cryptographically strong function to generate Base62 token client-side
genBase62Token(length)
{
console.log(this.refCode)
return window.btoa(Array.from(
window.crypto.getRandomValues(
new Uint8Array(length * 2)))
@ -71,7 +72,7 @@ export default class UserGenPage extends Component {
this.setState({
nickname: data.nickname,
bit_entropy: data.token_bits_entropy,
avatar_url: 'static/assets/avatars/' + data.nickname + '.png',
avatar_url: '/static/assets/avatars/' + data.nickname + '.png',
shannon_entropy: data.token_shannon_entropy,
bad_request: data.bad_request,
found: data.found,

2
frontend/static/frontend/main.js
View File

File diff suppressed because one or more lines are too long

4
frontend/static/frontend/main.js.LICENSE.txt
View File

@ -758,6 +758,10 @@
!*** ./node_modules/@mui/icons-material/ContentCopy.js ***!
\*********************************************************/
/*!*********************************************************!*\
!*** ./node_modules/@mui/icons-material/EmojiEvents.js ***!
\*********************************************************/
/*!*********************************************************!*\
!*** ./node_modules/@mui/icons-material/PriceChange.js ***!
\*********************************************************/

6
frontend/urls.py
View File

@ -2,11 +2,9 @@ from django.urls import path
from .views import index
urlpatterns = [
path("", index),
path("info/", index),
path("login/", index),
path("make/", index),
path("book/", index),
path("order/<int:orderId>", index),
path("wait/", index),
path("", index),
path("ref/<refCode>", index),
]