-
-
Notifications
You must be signed in to change notification settings - Fork 775
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
Kudos v1 #2492
Merged
Merged
Kudos v1 #2492
Changes from 250 commits
Commits
Show all changes
699 commits
Select commit
Hold shift + click to select a range
3e71b72
Don't show unclonable Kudos in marketplace
jasonrhaas 9a599fc
Merge pull request #33 from mbeacom/fix-dupes
jasonrhaas feacbe5
Add new kudos
jasonrhaas e97a12e
Don't restrict kudos minting at all
jasonrhaas 5e13c12
Merge pull request #35 from mbeacom/new-kudos
jasonrhaas f580549
Updates to handle the latest Kudos contract changes
jasonrhaas cd7c567
Merge pull request #36 from mbeacom/clone-fee
jasonrhaas 718ccba
Fix IPFS CORs problem again
jasonrhaas 7ef497a
Update how rarity gets set
jasonrhaas 274cc74
kudos.yaml now has tags as an array of strings
jasonrhaas 89b154e
Add new kudos images
jasonrhaas dbeabe4
update rinkeby address for abi.js
jasonrhaas e6cea39
new rinkeby contract address
jasonrhaas edf50fb
update crontab
jasonrhaas 6d19de6
Merge pull request #34 from mbeacom/fixes
jasonrhaas 766f9bb
Merge pull request #32 from mbeacom/kudos-integrate
jasonrhaas 9651a83
Merge branch 'kudos-v1' into deploy-latest
jasonrhaas 09370f0
Merge pull request #37 from mbeacom/deploy-latest
jasonrhaas 67653c1
Fix Kudos name not showing up on receive page
jasonrhaas 96ac80e
fix js bug in kudos_send
jasonrhaas 433376b
prompts
owocki 0f3fdf3
kudos levitation demo
owocki d6cbe6e
refactor
owocki b7fe1fa
kudos goodies
owocki 5fcc086
Add kudos email preview
jasonrhaas ab15065
change logo
octavioamu cf9735f
change detail kudos styles
octavioamu 009249c
change var kudos
octavioamu 820a7c4
Partials are fun
jasonrhaas 6eb6b0d
no more levitate
owocki 4c58921
Merge pull request #40 from mbeacom/kevin/kudos-levitate
owocki 8553dee
Kudos asset updates from badges repo
jasonrhaas 7d27350
Add new kudos fields, artist and platform
jasonrhaas 55b40bf
Update Rinkeby address
jasonrhaas 656a0cf
Add kudos_mainnet.yaml for soft launch
jasonrhaas 58dd2fa
add profile about
octavioamu 80744d1
Merge branch 'kudos-v1' into cellarius
octavioamu 3106a06
Add mainnet address
jasonrhaas c0485cd
Support reading private keys from .env
jasonrhaas a2703e8
Update kudos clone utils and mgmt functions
jasonrhaas feda495
Be able to pass mint_to address into command
jasonrhaas 320f5ee
Making clone kudos util command work
jasonrhaas c9d1c69
Add kudos private key vars to settings.py
jasonrhaas f28214e
Add update_kudos_metadata script (not tested yet)
jasonrhaas 335cb50
Kudos minted on mainnet will point to kudosdemo for now
jasonrhaas f33588b
Update external_url per network
jasonrhaas 3502f18
Add debug and value to gas estimate
jasonrhaas 36734e3
add author
octavioamu cd96e14
Merge pull request #42 from mbeacom/cellarius
owocki 2745bdc
Merge pull request #41 from mbeacom/email-urls
owocki f1363a9
change kudos send feedbacks
octavioamu 5d73b9e
add styles
octavioamu 5dbcbef
add kudos nav
octavioamu b9ac849
add styles
octavioamu c2b1592
add kudos nav
octavioamu 8b67b62
change logos
octavioamu 3850b49
change send kudos
octavioamu c8fd641
fixes the javascript on kudos details page
owocki 9539f48
add topbar on all pages
octavioamu a050f21
add grants nav
octavioamu 4a13a22
Fixes
octavioamu f8dc429
change menu
octavioamu b4a4268
add title to landing
octavioamu e853970
add gif logo
octavioamu f986cdb
adds kudos to results page
owocki 1656954
make fix
owocki 1d13ddf
Merge branch 'kudos-v1' into top-bar
owocki 6633757
Merge pull request #38 from mbeacom/top-bar
owocki b0e221c
comments
owocki 3686c86
make fix
owocki 42c24fe
fixes font awesome icongs
owocki 9846764
fix mobile menu
octavioamu f824989
Merge branch 'top-bar' of github.com:mbeacom/kudos into top-bar
octavioamu 5b8acea
add not found profiles
octavioamu 7ff6be4
Add burn util and management function
jasonrhaas 23d62c2
Go away psycopg2 warnings
jasonrhaas 4fed8c3
Merge branch 'kudos-v1' into mainnet-deploy
jasonrhaas d619dd6
Merge pull request #47 from mbeacom/mainnet-deploy
jasonrhaas 7152830
Merge pull request #46 from mbeacom/top-bar
jasonrhaas 16d0aa0
Fix fresh_start script
jasonrhaas 954f359
update kudos abi
jasonrhaas e95c366
add inactive and change claim kudos
octavioamu 51d07a0
a fix for kudos - levitate being off basee
owocki 61f9219
Add automatic local syncing via docker-command.bash
jasonrhaas 8733831
Merge branch 'kudos-v1' of github.com:mbeacom/kudos into kudos-v1
owocki 9e4e271
Merge pull request #48 from mbeacom/auto-local-sync
jasonrhaas 6e7d751
fix kudos navbar
octavioamu 9f79771
Merge branch 'kudos-v1' of github.com:mbeacom/kudos into kudos-v1
octavioamu efba48b
Merge branch 'master' into kudos-v1
octavioamu 0a7e181
fix svg font
octavioamu e06b913
Merge branch 'master' into kudos-v1
jasonrhaas ddad087
Remove mnemonic from docker-compose, use ENV var
jasonrhaas 74b5780
Update fresh_start script for web repo
jasonrhaas e562ceb
Fix typo for mnemonic
jasonrhaas 477c46d
Fix TEST_MNEMONIC quoting issue
jasonrhaas 7f26652
Upgrade to web3py 4.7.2
jasonrhaas e2323a0
Inject poa middleware for rinkeby network
jasonrhaas ba7dffa
Clean up extraneous python imports
jasonrhaas e0aca49
Remove deprecated kudos fixtures
jasonrhaas 6050f8a
Ignore the trouble making JS files
jasonrhaas 1fa25ba
Run isort on kudos files
jasonrhaas bb8c705
Run isort on dashboard
jasonrhaas 4cb6fbf
isort mails, emails, urls
jasonrhaas 4d3c26e
Minor formatting changes to make linter happy
jasonrhaas 02ae749
Updates to kudos_send to appease eslint
jasonrhaas 290063c
Replace totalSupply with getLatestId to get latest kudos id
jasonrhaas 0ff0495
fix lint js
octavioamu eaa067b
Merge branch 'kudos-v1' of github.com:jasonrhaas/web into kudos-v1
octavioamu af51faa
fix lint in range
octavioamu 8f60839
fix send kudos
octavioamu b56ee35
Quiet down the noise travis build
jasonrhaas 080467b
Merge branch 'kudos-v1' of github.com:jasonrhaas/web into kudos-v1
octavioamu 5fcc26a
Compress images
jasonrhaas b93f143
You win Stickler
jasonrhaas 15cbadc
Remove TODO from urls.py
jasonrhaas 8027044
Remove from __future__
jasonrhaas 0825c25
Docstring formatting
jasonrhaas 196573a
Remove extraneous migration file
jasonrhaas 71aab08
Revert "Quiet down the noise travis build"
jasonrhaas f11b0f4
Small formatting cleanup
jasonrhaas d7dbef6
Remove trailing whitespace
jasonrhaas 29af320
fix tabs.js broking wallets js
octavioamu b6fbac1
Merge branch 'kudos-v1' of github.com:jasonrhaas/web into kudos-v1
octavioamu d44106d
Temporarily disable kudos crontab entries
mbeacom 6910cdf
Clean up migration files
jasonrhaas c62835a
fix css lint
octavioamu acb5d4d
Merge branch 'kudos-v1' of github.com:jasonrhaas/web into kudos-v1
octavioamu c1326fa
Revert "Clean up migration files"
jasonrhaas 7f853c9
One more time
jasonrhaas 1e9a629
Minify tweenlite.js
jasonrhaas 8b9f1d4
Clean up exceptions for receive_url_for_recipient
jasonrhaas cf2f2ff
lipstick
jasonrhaas a52e158
Don't need kudos apps.py
jasonrhaas b65bac0
Add gettext to label
jasonrhaas 4e9e3e2
fix diffs
octavioamu 139c8aa
Move Kudos contract addresses to settings.py
jasonrhaas 237d388
Fix related_kudos filter
jasonrhaas ef98187
More formatting and dead code cleanup
jasonrhaas 7f6ae1a
hide grants menu link
octavioamu 5b4603b
Moar docstrings
jasonrhaas da00602
add faq
octavioamu 5771d42
Updates to account for multiple Kudos contracts
jasonrhaas 71ffc1e
comment out local_filter_middleware until its released
jasonrhaas 673e887
fix rain bg
octavioamu 05fd54b
add error msg
octavioamu b77a041
clean
octavioamu 7a628cd
fix https://github.com/mbeacom/gitcoin-erc721/issues/173
octavioamu a2d6692
Revert "Upgrade to web3py 4.7.2"
jasonrhaas 24eea68
network and contract_address should be required fields
jasonrhaas 9f0505f
Update link for "Start Over" in Kudos Send page
jasonrhaas e61345a
Fix migration file bug
jasonrhaas 54624e3
Don't put # in background_color
jasonrhaas f2c7a0b
FIx logging output to be token_id instead of row id
jasonrhaas 9895fea
Update sync_kudos log file name
jasonrhaas 4d4f13f
Add new kudos assets
jasonrhaas c10e167
Revert "Minify tweenlite.js"
jasonrhaas 37e3a67
Change to web3 4.6.0
jasonrhaas 1c1195d
Fix network name
jasonrhaas f30a64e
small updates
owocki a0dd998
Revert "Change to web3 4.6.0"
jasonrhaas b5dc4c3
Add smaller kudos_test.yaml for testing
jasonrhaas 1c450bb
Compress new kudos images
jasonrhaas e1b87d8
Display github picture if avatar doesn't exist
jasonrhaas fc12df9
Update sync method for multiple kudos contract
jasonrhaas eed6e59
remove bad localhost network detection
octavioamu e4a5bec
Fix compressed animations
octavioamu cbd8a4a
add disqus
octavioamu ce9a58d
add dot notification
octavioamu 7870521
fix sizes in select
octavioamu 8555465
change kudos text
octavioamu 6615d51
fix img size
octavioamu 882a71f
make fix, also: adds support for png images of each kudos
owocki 72db205
Break out kudos.Contract into its own model
jasonrhaas 6e8eaf4
Add new URL route to do lookups by contract and token_id
jasonrhaas a432009
Stub out some basic tests for Kudos
jasonrhaas 8dc716a
Update external_url to be the correct token_id for all networks
jasonrhaas d983e83
Add helper to resolve a kudos token
jasonrhaas 61842f2
More updates to handle multiple token_ids across contracts
jasonrhaas 3d11d5b
Update KUDOS_NETWORK env var
jasonrhaas 9f482ad
Update abi with latest contract code
jasonrhaas ad1c19c
Update --catchup flag for new schema
jasonrhaas 59b6152
Fix template typo
jasonrhaas 0100933
Make mint url consistent with others
jasonrhaas a45ef41
Fix get_token resolution logic
jasonrhaas abda5a9
Fix ability to load /send page without an id
jasonrhaas 6e94945
Extra space
jasonrhaas 970fdad
How about some tests
jasonrhaas c1e33b4
change about page
octavioamu 58956c8
change svgo command
octavioamu 1726a3f
add correct svg
octavioamu 8f18abd
iSort fixes
jasonrhaas 49fe27e
Merge branch 'master' into kudos-v1
jasonrhaas 10f73b5
Re-compress images using --disable=removeViewBox
jasonrhaas 86f5194
Revert "Compress images"
jasonrhaas 92ee347
Re-compress kudos images from scratch
jasonrhaas a4f55b8
Update rinkeby contract address
jasonrhaas c12acca
Don't add middleware twice (added downstream already)
jasonrhaas ac696e5
404 if the kudos id doesn't exist
jasonrhaas 84eae19
Fix confusing debug message
jasonrhaas 2ccf8f8
Add gas_estimate debug msg
jasonrhaas a8bc5b9
Add decorator to log out contract args
jasonrhaas be73005
Update rinkeby contract address
jasonrhaas 883bc1b
Update rinkeby contract
jasonrhaas f47b1b8
update rinkeby contract address for abi.js
jasonrhaas 0014c26
fix static subdomain for staging
jasonrhaas 8c299ad
Merge branch 'master' into kudos-v1
jasonrhaas 5cb9d94
Update rinkeby address
jasonrhaas c615d71
iSort fixx
jasonrhaas bb5b89b
Merge branch 'master' into kudos-v1
jasonrhaas c93596e
Fixes
jasonrhaas d27812f
Remove dead code
jasonrhaas 98e4708
Only show settings.KUDOS_NETWORK in marketplace
jasonrhaas e648f4d
Update kudos crontab
jasonrhaas cbd889d
change gif logo
octavioamu fe53eaf
rewrites marketplace search
octavioamu 9d6c59a
Add search test for marketplace
jasonrhaas 0f55941
Encode image names to handle bad chars
jasonrhaas 3cff4a8
FIx tags splitting incorrectly
jasonrhaas 819931f
fix usersearch console error
octavioamu acb48f8
fix inline send
octavioamu 964245d
add style for none clones
octavioamu 2a7d61b
fix inline send
octavioamu 19407c2
fix profile pictures
octavioamu aa9a16b
fix lint
octavioamu 7c44534
update text
octavioamu cea19ec
Change rarity labels
jasonrhaas 1c86485
add generation
octavioamu 6b49db3
Add new kudos assets
jasonrhaas c07800d
New deployment to rinkeby
jasonrhaas 29fb069
Update method id's for block listener
jasonrhaas e99937b
Handle case where start_id might not be valid
jasonrhaas c0af7e1
FIx blue box overlap values
jasonrhaas 87e14f9
Sync Gen0 token when cloned
jasonrhaas edfbee6
Fix kudos detail numbers
jasonrhaas aa7a0ee
Fix Kudos Indirect Send
jasonrhaas 23cb332
add gold line
octavioamu 3b65b3d
fix sent cards data
octavioamu a281f78
clean
octavioamu c6a33ab
fix pagination and change method
octavioamu 98fd05a
remove white space
octavioamu 7624be1
Update for latest Rinkeby Contract
jasonrhaas c2c55bd
FIx typo
jasonrhaas 9458d75
Update mainnet contract address
jasonrhaas c28901c
Add additional gas_price_gwei option
jasonrhaas ee4fb35
Make gas price optional
jasonrhaas 78b42d7
Fix sent kudos on profile, adjust some logic and DRY it up a bit
mbeacom 29e8d63
Adjust profile kudos queries to use both pref payout addy and profile…
mbeacom 033350c
Update kudos detail route to use kudos_id
mbeacom d24a727
hide kudos stuff until its been QAed... revert this when kudos has be…
owocki 46fe530
Squash kudos migrations
mbeacom File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
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
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -21,6 +21,7 @@ node_modules/ | |
gcoin/ | ||
.cache/ | ||
webpack-stats.json | ||
.sass-cache | ||
|
||
# Sensitive environment files | ||
.env | ||
|
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 |
---|---|---|
@@ -1,2 +1,4 @@ | ||
app/assets/v2/css/jquery.select2.min.css | ||
app/assets/v2/css/bootstrap.min.css | ||
app/assets/v2/js/tweenlite.js | ||
app/assets/v2/js/abi.js |
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
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
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 |
---|---|---|
|
@@ -25,7 +25,7 @@ window.onload = function() { | |
} | ||
ipfs.catText(document.ipfs_key_to_secret, function(err, key2) { | ||
if (err) { | ||
_alert('could not reach IPFS. please try again later.', 'error'); | ||
_alert('Could not reach IPFS. please try again later.', 'error'); | ||
jasonrhaas marked this conversation as resolved.
Show resolved
Hide resolved
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. 😅 |
||
return; | ||
} | ||
document.priv_key = combine_secrets(key2, document.gitcoin_secret); | ||
|
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
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,37 @@ | ||
$blue: #0D0764; | ||
|
||
[data-rangeslider] { | ||
-webkit-appearance: none; | ||
width: 100%; | ||
height: 2px; | ||
background: $blue; | ||
outline: none; | ||
margin: 1rem 0; | ||
|
||
&::-webkit-slider-thumb { | ||
-webkit-appearance: none; | ||
appearance: none; | ||
width: 18px; | ||
height: 18px; | ||
border-radius: 50px; | ||
background: $blue; | ||
cursor: pointer; | ||
transition: .1s all linear; | ||
} | ||
|
||
&:hover::-webkit-slider-thumb { | ||
width: 22px; | ||
height: 22px; | ||
} | ||
&:focus::-webkit-slider-thumb { | ||
width: 26px; | ||
height: 26px; | ||
border-radius: 50px 50px 4px; | ||
transform: rotate(45deg); | ||
margin-bottom: 50px; | ||
} | ||
|
||
&::-webkit-slider-runnable-track {} | ||
} | ||
|
||
|
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.
Can we update this model to directly relate to
Profile
?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.
@jasonrhaas