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
refactor YGE code (done) & start on bulk payouts (done) #1666
Merged
Merged
Changes from 22 commits
Commits
Show all changes
30 commits
Select commit
Hold shift + click to select a range
cb15b64
destroys a lot of the YGE code
owocki 3d5b768
rename yge to onepager
owocki dbc0620
starts to rebuild the send page
owocki 9c8df3a
adds some scripts back as quarantines
owocki 00e3ac5
new send flow is working
owocki 77311df
starts to build the receive tx flow
owocki 4029451
eth tips working
owocki b9181f0
receive now works for tokens
owocki 2b65453
linter
owocki 943f659
starts bulk payout
owocki 6add975
Merge branch 'master' into kevin/yge_demolition_and_bulk_payout
owocki d832210
linter
owocki d3daae6
ui for bulk payouts
owocki 6f0ad07
tests
owocki fa27f77
happy linter. happy
owocki 4fd0340
i18n, and a few cleanups here and there
owocki 410eb59
final touches, satisfy linter
owocki f419554
yge deprecation
owocki 4350279
Makes the css for the gas settings correct
SaptakS dc4831a
Fixes the scroll in the onepager with the animation in bg
SaptakS 88d1081
Prettifies Payout Preview in bulk bounty
SaptakS 6fddd05
Align the payout
SaptakS e541eb8
payment success view
owocki 9f69dc4
Merge branch 'kevin/yge_demolition_and_bulk_payout' of github.com:git…
owocki 9c2d629
Merge branch 'master' into kevin/yge_demolition_and_bulk_payout
owocki 1ea4821
copy
owocki d2bcb51
back button
owocki 47c3c5d
Merge branch 'master' into kevin/yge_demolition_and_bulk_payout
owocki 00d9b5e
saptak/aditya QA
owocki b27ab00
alis feedback
owocki File filter
Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
File renamed without changes.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -29,11 +29,11 @@ | |
import dashboard.embed | ||
import dashboard.helpers | ||
import dashboard.ios | ||
import dashboard.tip_views | ||
import dashboard.views | ||
import dataviz.d3_views | ||
import dataviz.views | ||
import enssubdomain.views | ||
import ethos.views | ||
import external_bounties.views | ||
import faucet.views | ||
import gitcoinbot.views | ||
|
@@ -80,6 +80,7 @@ | |
url(r'^new/?', dashboard.views.new_bounty, name='new_funding_short'), | ||
path('issue/fulfill', dashboard.views.fulfill_bounty, name='fulfill_bounty'), | ||
path('issue/accept', dashboard.views.accept_bounty, name='process_funding'), | ||
path('issue/payout', dashboard.views.bulk_payout_bounty, name='bulk_payout_bounty'), | ||
path('issue/increase', dashboard.views.increase_bounty, name='increase_bounty'), | ||
path('issue/cancel', dashboard.views.cancel_bounty, name='kill_bounty'), | ||
|
||
|
@@ -120,11 +121,18 @@ | |
url(r'^funding/details/?', dashboard.views.bounty_details, name='funding_details'), | ||
|
||
# Tips | ||
url(r'^tip/receive/?', dashboard.views.receive_tip, name='receive_tip'), | ||
url(r'^tip/send/2/?', dashboard.views.send_tip_2, name='send_tip_2'), | ||
url(r'^tip/send/?', dashboard.views.send_tip, name='send_tip'), | ||
url(r'^send/?', dashboard.views.send_tip, name='tip'), | ||
url(r'^tip/?', dashboard.views.send_tip, name='tip'), | ||
url( | ||
r'^tip/receive/v2/(?P<pk>.*)/(?P<txid>.*)/(?P<network>.*)?', | ||
dashboard.tip_views.receive_tip_v2, | ||
name='receive_tip' | ||
), | ||
url(r'^tip/receive/?', dashboard.tip_views.receive_tip_legacy, name='receive_tip_legacy'), | ||
url(r'^tip/send/4/?', dashboard.tip_views.send_tip_4, name='send_tip_4'), | ||
url(r'^tip/send/3/?', dashboard.tip_views.send_tip_3, name='send_tip_3'), | ||
url(r'^tip/send/2/?', dashboard.tip_views.send_tip_2, name='send_tip_2'), | ||
url(r'^tip/send/?', dashboard.tip_views.send_tip, name='send_tip'), | ||
url(r'^send/?', dashboard.tip_views.send_tip, name='tip'), | ||
url(r'^tip/?', dashboard.tip_views.send_tip, name='tip'), | ||
|
||
# Legal | ||
url(r'^terms/?', dashboard.views.terms, name='_terms'), | ||
|
@@ -143,12 +151,6 @@ | |
url(r'^tools/?', dashboard.views.toolbox, name='tools'), | ||
url(r'^gas/?', dashboard.views.gas, name='gas'), | ||
|
||
# redeem coin | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. whats fun is that we could now programatically create tips and use those to redeem coin airdrops There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. or even extend the current receive flow to accept 721s |
||
url(r'^coin/redeem/(.*)/?', dashboard.views.redeem_coin, name='redeem'), | ||
|
||
# EthOS | ||
path('ethos/', include('ethos.urls', namespace='ethos')), | ||
|
||
# images | ||
re_path(r'^funding/embed/?', dashboard.embed.embed, name='embed'), | ||
re_path(r'^funding/avatar/?', avatar.views.handle_avatar, name='avatar'), | ||
|
File renamed without changes.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
File renamed without changes
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes.
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes.
File renamed without changes.
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,136 @@ | ||
|
||
var doconfetti = function(){ | ||
|
||
(function() { | ||
var COLORS, Confetti, NUM_CONFETTI, PI_2, canvas, confetti, context, drawCircle, i, range, resizeWindow, xpos; | ||
|
||
NUM_CONFETTI = 350; | ||
|
||
COLORS = [[85, 71, 106], [174, 61, 99], [219, 56, 83], [244, 92, 68], [248, 182, 70]]; | ||
|
||
PI_2 = 2 * Math.PI; | ||
|
||
canvas = document.getElementById("world"); | ||
|
||
context = canvas.getContext("2d"); | ||
|
||
window.w = 0; | ||
|
||
window.h = 0; | ||
|
||
resizeWindow = function() { | ||
window.w = canvas.width = window.innerWidth; | ||
return window.h = canvas.height = window.innerHeight; | ||
}; | ||
|
||
window.addEventListener('resize', resizeWindow, false); | ||
|
||
setTimeout(resizeWindow, 0); | ||
|
||
range = function(a, b) { | ||
return (b - a) * Math.random() + a; | ||
}; | ||
|
||
drawCircle = function(x, y, r, style) { | ||
context.beginPath(); | ||
context.arc(x, y, r, 0, PI_2, false); | ||
context.fillStyle = style; | ||
return context.fill(); | ||
}; | ||
|
||
xpos = 0.5; | ||
|
||
document.onmousemove = function(e) { | ||
return xpos = e.pageX / w; | ||
}; | ||
|
||
window.requestAnimationFrame = (function() { | ||
return window.requestAnimationFrame || window.webkitRequestAnimationFrame || window.mozRequestAnimationFrame || window.oRequestAnimationFrame || window.msRequestAnimationFrame || function(callback) { | ||
return window.setTimeout(callback, 1000 / 60); | ||
}; | ||
})(); | ||
|
||
Confetti = (function() { | ||
function Confetti() { | ||
this.style = COLORS[~~range(0, 5)]; | ||
this.rgb = "rgba(" + this.style[0] + "," + this.style[1] + "," + this.style[2]; | ||
this.r = ~~range(2, 6); | ||
this.r2 = 2 * this.r; | ||
this.replace(); | ||
} | ||
|
||
Confetti.prototype.replace = function() { | ||
this.opacity = 0; | ||
this.dop = 0.03 * range(1, 4); | ||
this.x = range(-this.r2, w - this.r2); | ||
this.y = range(-20, h - this.r2); | ||
this.xmax = w - this.r; | ||
this.ymax = h - this.r; | ||
this.vx = range(0, 2) + 8 * xpos - 5; | ||
return this.vy = 0.7 * this.r + range(-1, 1); | ||
}; | ||
|
||
Confetti.prototype.draw = function() { | ||
var ref; | ||
this.x += this.vx; | ||
this.y += this.vy; | ||
this.opacity += this.dop; | ||
if (this.opacity > 1) { | ||
this.opacity = 1; | ||
this.dop *= -1; | ||
} | ||
if (this.opacity < 0 || this.y > this.ymax) { | ||
this.replace(); | ||
} | ||
if (!((0 < (ref = this.x) && ref < this.xmax))) { | ||
this.x = (this.x + this.xmax) % this.xmax; | ||
} | ||
return drawCircle(~~this.x, ~~this.y, this.r, this.rgb + "," + this.opacity + ")"); | ||
}; | ||
|
||
return Confetti; | ||
|
||
})(); | ||
|
||
confetti = (function() { | ||
var j, ref, results; | ||
results = []; | ||
for (i = j = 1, ref = NUM_CONFETTI; 1 <= ref ? j <= ref : j >= ref; i = 1 <= ref ? ++j : --j) { | ||
results.push(new Confetti); | ||
} | ||
return results; | ||
})(); | ||
|
||
window.step = function() { | ||
var c, j, len, results; | ||
requestAnimationFrame(step); | ||
context.clearRect(0, 0, w, h); | ||
results = []; | ||
for (j = 0, len = confetti.length; j < len; j++) { | ||
c = confetti[j]; | ||
results.push(c.draw()); | ||
} | ||
return results; | ||
}; | ||
|
||
step(); | ||
|
||
}).call(this); | ||
|
||
}; | ||
|
||
var stopConfetti = function(){ | ||
var element = $("world"); | ||
element.parentNode.removeChild(element); | ||
setTimeout(function(){ | ||
},100); | ||
}; | ||
|
||
|
||
var startConfetti = function(){ | ||
doconfetti(); | ||
setTimeout(function(){ | ||
stopConfetti(); | ||
}, 4000); | ||
}; | ||
|
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,9 @@ | ||
/* eslint-disable no-console */ | ||
window.onload = function() { | ||
waitforWeb3(function() { | ||
if (document.web3network != document.network) { | ||
_alert({ message: gettext('You are not on the right web3 network. Please switch to ') + document.network }, 'error'); | ||
} | ||
$('#network').val(document.web3network); | ||
}); | ||
}; |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@owocki @SaptakS @mbeacom should we rename this into something more meaning full ? ( we can do it in a follow up PR)
/2
,/3
seems cryptic :PThere was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
the numbers are the step numbers.. sequential numbers seem straightforward to me..