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

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 2 additions & 0 deletions .eslintignore
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@ app/assets/v2/js/jquery*.js
app/assets/v2/js/jsrender.js
app/assets/v2/js/showdown.js
app/assets/v2/js/tooltip.js
app/assets/v2/js/tweenlite.js
app/assets/v2/js/abi.js

app/assets/onepager/js/confetti.js

Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ node_modules/
gcoin/
.cache/
webpack-stats.json
.sass-cache

# Sensitive environment files
.env
Expand Down
2 changes: 2 additions & 0 deletions .stylelintignore
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
10 changes: 9 additions & 1 deletion app/app/context.py
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
from django.utils import timezone

from dashboard.models import Tip
from kudos.models import KudosTransfer


def insert_settings(request):
Expand All @@ -44,7 +45,7 @@ def insert_settings(request):
'mixpanel_token': settings.MIXPANEL_TOKEN,
'STATIC_URL': settings.STATIC_URL,
'MEDIA_URL': settings.MEDIA_URL,
'num_slack': num_slack,
'num_slack': num_slack,
jasonrhaas marked this conversation as resolved.
Show resolved Hide resolved
'github_handle': request.user.username if user_is_authenticated else False,
'email': request.user.email if user_is_authenticated else False,
'name': request.user.get_full_name() if user_is_authenticated else False,
Expand Down Expand Up @@ -75,7 +76,14 @@ def insert_settings(request):
username__iexact=context['github_handle'],
web3_type='v3',
).exclude(txid='')
context['unclaimed_kudos'] = KudosTransfer.objects.filter(
receive_txid='',
username__iexact="@" + context['github_handle'],
web3_type='v3',
).exclude(txid='')

if not settings.DEBUG:
context['unclaimed_tips'] = context['unclaimed_tips'].filter(network='mainnet')
context['unclaimed_kudos'] = context['unclaimed_kudos'].filter(network='mainnet')
jasonrhaas marked this conversation as resolved.
Show resolved Hide resolved

return context
14 changes: 13 additions & 1 deletion app/app/settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,9 @@
import raven
from easy_thumbnails.conf import Settings as easy_thumbnails_defaults

import warnings
warnings.filterwarnings("ignore", category=UserWarning, module='psycopg2')

root = environ.Path(__file__) - 2 # Set the base directory to two levels.
env = environ.Env(DEBUG=(bool, False), ) # set default values and casting
env.read_env(str(root.path('app/.env'))) # reading .env file
Expand Down Expand Up @@ -101,6 +104,8 @@
'external_bounties',
'dataviz',
'impersonate',
'kudos',
'django.contrib.postgres',
jasonrhaas marked this conversation as resolved.
Show resolved Hide resolved
'bounty_requests'
]

Expand Down Expand Up @@ -130,7 +135,7 @@

TEMPLATES = [{
'BACKEND': 'django.template.backends.django.DjangoTemplates',
'DIRS': ['retail/templates/', 'external_bounties/templates/', 'dataviz/templates', ],
'DIRS': ['retail/templates/', 'external_bounties/templates/', 'dataviz/templates', 'kudos/templates'],
'APP_DIRS': True,
'OPTIONS': {
'context_processors': [
Expand Down Expand Up @@ -489,6 +494,13 @@
SLACK_TOKEN = env('SLACK_TOKEN', default='') # TODO
SLACK_WELCOMEBOT_TOKEN = env('SLACK_WELCOMEBOT_TOKEN', default='') # TODO

# OpenSea API
OPENSEA_API_KEY = env('OPENSEA_API_KEY', default='')

# Kudos
KUDOS_OWNER_ACCOUNT = env('KUDOS_OWNER_ACCOUNT', default='')
KUDOS_PRIVATE_KEY = env('KUDOS_PRIVATE_KEY', default='')

# Reporting Integrations
MIXPANEL_TOKEN = env('MIXPANEL_TOKEN', default='')

Expand Down
30 changes: 27 additions & 3 deletions app/app/urls.py
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@
import faucet.views
import gitcoinbot.views
import healthcheck.views
import kudos.views
import linkshortener.views
import marketing.views
import marketing.webhookviews
Expand All @@ -48,21 +49,41 @@
import tdi.views
from dashboard.router import router as dbrouter
from external_bounties.router import router as ebrouter
from kudos.router import router as kdrouter

from .sitemaps import sitemaps

urlpatterns = [
path('jsi18n/', JavaScriptCatalog.as_view(), name='javascript-catalog'),

# kudos
path('kudos/', kudos.views.about, name='kudos_main'),
path('kudos/about/', kudos.views.about, name='kudos_about'),
path('kudos/marketplace/', kudos.views.marketplace, name='kudos_marketplace'),
path('kudos/mint', kudos.views.mint, name='kudos_mint'),
path('kudos/send/', kudos.views.send_2, name='kudos_send'),
path('kudos/send/3/', kudos.views.send_3, name='kudos_send_3'),
path('kudos/send/4/', kudos.views.send_4, name='kudos_send_4'),
re_path(r'^lazy_load_kudos/$', dashboard.views.lazy_load_kudos, name='lazy_load_kudos'),
re_path(
r'^kudos/receive/v3/(?P<key>.*)/(?P<txid>.*)/(?P<network>.*)?',
kudos.views.receive,
name='kudos_receive'
),
re_path(r'^kudos/search/$', kudos.views.search, name='kudos_search'),
re_path(r'^kudos/(?P<id>\d+)/(?P<name>\w*)', kudos.views.details, name='kudos_details'),
re_path(r'^kudos/address/(?P<handle>.*)', kudos.views.kudos_preferred_wallet, name='kudos_preferred_wallet'),

# api views
url(r'^api/v0.1/profile/(.*)?/keywords', dashboard.views.profile_keywords, name='profile_keywords'),
url(r'^api/v0.1/funding/save/?', dashboard.ios.save, name='save'),
url(r'^api/v0.1/faucet/save/?', faucet.views.save_faucet, name='save_faucet'),
url(r'^api/v0.1/', include(dbrouter.urls)),
url(r'^api/v0.1/', include(ebrouter.urls)),
url(r'^actions/api/v0.1/', include(dbrouter.urls)), # same as active, but not cached in cloudfront
url(r'^api/v0.1/users_search/', dashboard.views.get_users, name='users_search'),

url(r'^api/v0.1/', include(kdrouter.urls)),
url(r'^actions/api/v0.1/', include(dbrouter.urls)), # same as active, but not cached in cluodfront
url(r'^api/v0.1/users_search/', dashboard.views.get_users, name='users_search'),
url(r'^api/v0.1/kudos_search/', dashboard.views.get_kudos, name='kudos_search'),
# Health check endpoint
re_path(r'^health/', include('health_check.urls')),
re_path(r'^lbcheck/?', healthcheck.views.lbcheck, name='lbcheck'),
Expand Down Expand Up @@ -252,6 +273,9 @@

# admin views
re_path(r'^_administration/?', admin.site.urls, name='admin'),
path('_administration/email/new_kudos', retail.emails.new_kudos, name='new_kudos'),
path('_administration/email/kudos_mint', retail.emails.kudos_mint, name='kudos_mint'),
path('_administration/email/kudos_mkt', retail.emails.kudos_mkt, name='kudos_mkt'),
path('_administration/email/new_bounty', retail.emails.new_bounty, name='admin_new_bounty'),
path('_administration/email/roundup', retail.emails.roundup, name='roundup'),
path('_administration/email/faucet_rejected', retail.emails.faucet_rejected, name='email_faucet_rejected'),
Expand Down
2 changes: 1 addition & 1 deletion app/assets/onepager/js/receive.js
Original file line number Diff line number Diff line change
Expand Up @@ -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
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

😅

return;
}
document.priv_key = combine_secrets(key2, document.gitcoin_secret);
Expand Down
8 changes: 7 additions & 1 deletion app/assets/v2/css/base.css
Original file line number Diff line number Diff line change
Expand Up @@ -454,7 +454,7 @@ p a {
}

.btn:focus {
box-shadow: none;
/* box-shadow: none; */
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should we drop this?

}

.cta-green {
Expand Down Expand Up @@ -604,6 +604,12 @@ input[type=text].loading {
font-size: 0.875rem;
}

.select2-results,
.select2-results{
max-height: 400px;
overflow-y: scroll;
}

.select2-results__option:empty {
padding: 1px;
border-bottom: solid 1px darkgray;
Expand Down
10 changes: 0 additions & 10 deletions app/assets/v2/css/buttons.css
Original file line number Diff line number Diff line change
Expand Up @@ -60,16 +60,6 @@
box-shadow: inset 0 -3.25em 0 0 var(--hover);
}

.slide {
--color: #8fc866;
--hover: #66c887;
}

.slide:hover,
.slide:focus {
box-shadow: inset 6.5em 0 0 0 var(--hover);
}

.offset {
--color: #19bc8b;
--hover: #1973bc;
Expand Down
37 changes: 29 additions & 8 deletions app/assets/v2/css/gitcoin.css
Original file line number Diff line number Diff line change
Expand Up @@ -399,6 +399,14 @@ div.button-pink {
cursor: pointer;
}

.gc-round-text-input {
height: 32px;
border: 1px solid #eee;
outline: none;
padding-left: 10px;
font-weight: 300;
}

.gc-border-black {
border: 1px solid black !important;
}
Expand All @@ -407,16 +415,12 @@ div.button-pink {
border: 1px solid #37ea9c !important;
}

.gc-selected {
border: 1px solid #4ef6ad !important;
.gc-border-blue {
border-color: #0D0764;
}

.gc-round-text-input {
height: 32px;
border: 1px solid #eee;
outline: none;
padding-left: 10px;
font-weight: 300;
.gc-selected {
border: 1px solid #4ef6ad !important;
}

.gc-round-text-form {
Expand Down Expand Up @@ -554,6 +558,23 @@ div.button-pink {
}
}

.nav-line {

}
.nav-tabs .nav-line {
color: #4A4A4A;
border-width: 0px 0px 3px 0;
}
.nav-tabs .nav-line.active {
color: #0D0764;
border-color: #0D0764;
background-color: transparent;
}

.border-transparent {
border-color: transparent;
}

/* AutoComplete */
.select2-container .select2-selection--single {
height: 2.5rem !important
Expand Down
37 changes: 37 additions & 0 deletions app/assets/v2/css/kudos/range-slider.scss
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 {}
}


71 changes: 71 additions & 0 deletions app/assets/v2/css/kudos/select2.bootstrap4.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,71 @@
$arrow-color: #6c757d;
$border-grey: #ced4da;

.select2 {
width: 100%;
}

.select2-container--bootstrap4 {
border: 1px solid #ced4da;
padding: 0.25em;
border-radius: .25rem;
}

.select2-container--bootstrap4.select2-container--disabled {
background-color: #e9ecef;
opacity: 1;
}

.select2-container--bootstrap4.select2-container--open .select2-selection .select2-selection__arrow b {
border-color: transparent transparent $arrow-color transparent;
border-width: 0 0.45rem 0.45rem 0.45rem;
}

.select2-container--bootstrap4 .select2-selection--single .select2-selection__arrow {
position: absolute;
bottom: 0;
right: 0.375rem;
top: 0;
width: 0.85rem;
}

.select2-container--bootstrap4 .select2-selection--single .select2-selection__arrow b {
border-color: $arrow-color transparent transparent transparent;
border-style: solid;
border-width: 0.45rem 0.45rem 0 0.45rem;
height: 0;
left: 0;
// margin-top: -0.125rem;
octavioamu marked this conversation as resolved.
Show resolved Hide resolved
position: absolute;
top: 0;
bottom: 0;
width: 0;
border-radius: 4px;
margin: auto;
}


.select2-container--bootstrap4 .select2-search--dropdown .select2-search__field {
border-radius: 4px;
border: 1px solid #7777;
}

.select2-container--open .select2-dropdown.select2-dropdown--below {
top: -3px;
left: -1px;
}

.select2-container--open .select2-dropdown.select2-dropdown--above {
top: 1px;
left: -1px;
}

.select2-container--bootstrap4 .select2-dropdown {
border-color: $border-grey;
}


.select2-container--bootstrap4 .select2-results__option--highlighted[aria-selected] {
background-color: #5897fb;
color: white;
}
Loading