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

stable -> master #6433

Merged
merged 22 commits into from
Apr 14, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions app/app/settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -797,6 +797,8 @@ def callback(request):

# Gitcoin Bounty Funding Fee settings
FEE_ADDRESS = env('FEE_ADDRESS', default='')

ALETHIO_KEY = env('ALETHIO_KEY', default='')
FEE_ADDRESS_PRIVATE_KEY = env('FEE_ADDRESS_PRIVATE_KEY', default='')
SLIPPAGE = env.float('SLIPPAGE', default=0.05)
UNISWAP_LIQUIDITY_FEE = env.float('UNISWAP_LIQUDITY_FEE', default=0.003)
Expand Down
2,385 changes: 2,385 additions & 0 deletions app/assets/v2/images/avatar3d/bendy.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
9 changes: 9 additions & 0 deletions app/avatar/views_3d.py
Original file line number Diff line number Diff line change
Expand Up @@ -649,6 +649,15 @@ def get_avatar_attrs(theme, key):
'tone_maps': [],
'path': 'assets/v2/images/avatar3d/bender.svg',
},
'bendy': {
'preview_viewbox': {
'background': '0 0 250 250',
},
'skin_tones': [],
'hair_tones': [],
'tone_maps': [],
'path': 'assets/v2/images/avatar3d/bendy.svg',
},
'joker': {
'preview_viewbox': {
'background': '0 0 350 350',
Expand Down
4 changes: 2 additions & 2 deletions app/dashboard/router.py
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@
from retail.helpers import get_ip

from .models import (
Activity, Bounty, BountyFulfillment, BountyInvites, HackathonEvent, HackathonProject, Interest, Profile, ProfileSerializer,
SearchHistory
Activity, Bounty, BountyFulfillment, BountyInvites, HackathonEvent, HackathonProject, Interest, Profile,
ProfileSerializer, SearchHistory,
)

logger = logging.getLogger(__name__)
Expand Down
4 changes: 2 additions & 2 deletions app/dashboard/templates/dashboard/index-vue.html
Original file line number Diff line number Diff line change
Expand Up @@ -252,8 +252,8 @@
font-size: 0.7rem;
}
.summary {
height: 70px;
max-height: 70px;
/* height: 70px; */
/* max-height: 70px; */
}
.looking-team {
background-color: rgba(62, 0, 255, 0.05);
Expand Down
21 changes: 10 additions & 11 deletions app/dashboard/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@
from django.views.decorators.clickjacking import xframe_options_exempt
from django.views.decorators.csrf import csrf_exempt
from django.views.decorators.http import require_GET, require_POST

import magic
from app.utils import clean_str, ellipses, get_default_network
from avatar.models import AvatarTheme
Expand Down Expand Up @@ -84,12 +85,11 @@
from oauth2_provider.decorators import protected_resource
from pytz import UTC
from ratelimit.decorators import ratelimit
from rest_framework.renderers import JSONRenderer
from retail.helpers import get_ip
from retail.utils import programming_languages, programming_languages_full
from rest_framework.renderers import JSONRenderer
from townsquare.models import Comment
from townsquare.views import get_following_tribes
from townsquare.views import get_tags
from townsquare.views import get_following_tribes, get_tags
from web3 import HTTPProvider, Web3

from .export import (
Expand All @@ -109,15 +109,12 @@
maybe_market_tip_to_email, maybe_market_tip_to_github, maybe_market_tip_to_slack, maybe_market_to_email,
maybe_market_to_github, maybe_market_to_slack, maybe_market_to_user_discord, maybe_market_to_user_slack,
)
from .router import HackathonEventSerializer, HackathonProjectSerializer
from .utils import (
apply_new_bounty_deadline, get_bounty, get_bounty_id, get_context, get_custom_avatars, get_unrated_bounties_count,
get_web3, has_tx_mined, is_valid_eth_address, re_market_bounty, record_user_action_on_interest,
release_bounty_to_the_public, sync_payout, web3_process_bounty,
)
from .router import (
HackathonEventSerializer,
HackathonProjectSerializer
)

logger = logging.getLogger(__name__)

Expand Down Expand Up @@ -3726,7 +3723,7 @@ def hackathon(request, hackathon='', panel='prizes'):

following_tribes = []

if request.user and request.user.profile:
if request.user and hasattr(request.user, 'profile'):
following_tribes = request.user.profile.tribe_members.filter(
org__in=hackathon_event.sponsor_profiles.all()
).values_list('org__handle', flat=True)
Expand All @@ -3741,9 +3738,11 @@ def hackathon(request, hackathon='', panel='prizes'):
'bounty_count': Bounty.objects.filter(bounty_owner_github_username=sponsor_profile.handle).count()
}
orgs.append(org)

is_registered = HackathonRegistration.objects.filter(registrant=request.user.profile,
hackathon=hackathon_event) if request.user and request.user.profile else None
if hasattr(request.user, 'profile') == False:
is_registered = False
else:
is_registered = HackathonRegistration.objects.filter(registrant=request.user.profile,
hackathon=hackathon_event) if request.user and request.user.profile else None

if not is_registered and not (request.user and (request.user.is_staff or request.user.is_superuser)):
return redirect(reverse('hackathon_onboard', args=(hackathon_event.slug,)))
Expand Down
Loading