From 72e5c3ee44cc45cb80459e8b9e63a9e25f089618 Mon Sep 17 00:00:00 2001 From: Miguel Angel G Date: Fri, 18 Sep 2020 12:31:30 -0500 Subject: [PATCH 1/4] Add hackathons events --- app/assets/onepager/css/main.css | 17 +++ app/dashboard/gas_views.py | 12 +++ app/retail/templates/gas_history.html | 147 +++++++++++++++++++++----- 3 files changed, 149 insertions(+), 27 deletions(-) diff --git a/app/assets/onepager/css/main.css b/app/assets/onepager/css/main.css index 139e80ef99f..f8dc6719dc4 100644 --- a/app/assets/onepager/css/main.css +++ b/app/assets/onepager/css/main.css @@ -544,6 +544,23 @@ body #main a:not(.button):hover { color: #ec5597; } + +body #main a.no-pink { + color: var(--gc-blue); +} + +body #main a.no-pink:hover { + color: var(--gc-blue-hover); +} + +body #main a.no-pink.btn-gc-blue { + color: #ffffff; +} + +body #main a.text-black.no-pink { + color: black; +} + .proPic { width: 25vmin; margin: 0.75vmin; diff --git a/app/dashboard/gas_views.py b/app/dashboard/gas_views.py index c7335900dcd..9c04f64f46a 100644 --- a/app/dashboard/gas_views.py +++ b/app/dashboard/gas_views.py @@ -245,6 +245,15 @@ def gas_history_view(request): for gh in gas_histories[i]: max_y = max(gh[0], max_y) breakdown_ui = breakdown.replace('ly', '') if breakdown != 'daily' else 'day' + + events = JSONStore.objects.get(key='hackathons', view='hackathons').data[1] + default_tab = 'current' + + tabs = [ + ('current', 'happening now'), + ('upcoming', 'upcoming'), + ('finished', 'completed'), + ] context = { 'title': _('Live Ethereum (ETH) Gas History'), 'card_desc': _('See and comment on the Ethereum (ETH) Gas - Hourly History Graph'), @@ -254,5 +263,8 @@ def gas_history_view(request): 'breakdown': breakdown, 'breakdown_ui': breakdown_ui, 'granularity_options': granularity_options, + 'events': events, + 'tabs': tabs, + 'default_tab': default_tab } return TemplateResponse(request, 'gas_history.html', context) diff --git a/app/retail/templates/gas_history.html b/app/retail/templates/gas_history.html index a94f1420fce..8cf147d35d4 100644 --- a/app/retail/templates/gas_history.html +++ b/app/retail/templates/gas_history.html @@ -1,7 +1,8 @@ {% extends 'onepager/base.html' %} -{% load i18n static %} +{% load i18n static date_fromisoformat timesince_fromisoformat %} {% block 'scripts' %} + {% endblock %} @@ -13,42 +14,134 @@ {% block 'main' %}
-{% include 'shared/gas_nav.html' %} +
+ {% include 'shared/gas_nav.html' %} -

{% trans "Gas History" %} ({{breakdown}}) {% trans "Alpha" %}

+

{% trans "Gas History" %} ({{breakdown}}) {% trans "Alpha" %}

- + -
- {% for key, val in lines.items %} -

{% trans "Gas price needed to confirm within" %} {{key}} {% trans "minute" %}{{key|pluralize}}

- {% endfor %} +
+ {% for key, val in lines.items %} +

{% trans "Gas price needed to confirm within" %} {{key}} {% trans "minute" %}{{key|pluralize}}

+ {% endfor %} +
+ + {% if gas_histories == '[]' %} +

+ {% blocktrans %} We are unable to sync gas data at this time. We recommend you check out ETH Gas Station instead.{% endblocktrans %} +

+ {% else %} + + {% include 'shared/gas_history.html' with y_axis="Gas Price (gwei)" %} + {% endif %}
+
+
+
+ +
+
-{% if gas_histories == '[]' %} -

- {% blocktrans %} We are unable to sync gas data at this time. We recommend you check out ETH Gas Station instead.{% endblocktrans %} -

-{% else %} - - {% include 'shared/gas_history.html' with y_axis="Gas Price (gwei)" %} - {% include 'shared/disqus.html' with page_url='https://gitcoin.co/gas/history?' %} +
+ {% if events|length %} +
+
+ {% for event in events %} + -
+
-
- +
+
+ + {% if event.logo %} + + {% else %} + + {% endif %} + +
-{% endif %} +
+
+ + {{ event.name }} + +
+
+ From + + To + +
+
+

{{ event.summary }}

+
+ {% if event.sponsor_profiles|length %} +
+ Sponsored by + {% for sponsor in event.sponsor_profiles %} + + {% endfor %} +
+ {% endif %} +
+ {% if event.end_date|timesince_fromisoformat <= "1 min" %} + + + Join + + {% endif %} + {% if event.display_showcase %} + + + + Showcase + + {% endif %} + {% if event.start_date|timesince_fromisoformat >= "1 min" and event.end_date|timesince_fromisoformat <= "1 min"%} + + + Prizes + + {% endif %} + {% if event.show_results %} + + + Projects + + {% endif %} +
+
+
+
+ {% endfor %} +
+
+ {% endif %} +
+
From 121204b2bc49459650e18f63cac87d996207fc18 Mon Sep 17 00:00:00 2001 From: Miguel Angel G Date: Wed, 23 Sep 2020 00:21:32 -0500 Subject: [PATCH 2/4] Add UTMs to hypercharge mode --- app/assets/v2/js/shared.js | 4 ++++ app/dashboard/models.py | 4 +++- app/dashboard/notifications.py | 7 +++++-- app/dashboard/router.py | 2 +- app/dashboard/templates/dashboard/explorer.html | 3 ++- app/marketing/management/commands/hypercharge_mode.py | 3 ++- app/retail/templates/emails/bounty.html | 6 +++--- app/retail/templates/emails/bounty_hypercharged.html | 2 +- app/retail/templates/emails/new_bounty.html | 2 +- app/retail/templates/emails/shared_bounty_actions.html | 6 +++++- 10 files changed, 27 insertions(+), 12 deletions(-) diff --git a/app/assets/v2/js/shared.js b/app/assets/v2/js/shared.js index 0c60fb04b9e..ae3c299219e 100644 --- a/app/assets/v2/js/shared.js +++ b/app/assets/v2/js/shared.js @@ -858,6 +858,10 @@ const renderFeaturedBountiesFromResults = (results, renderForExplorer) => { if (relatedTokenDetails && relatedTokenDetails.decimals) { decimals = relatedTokenDetails.decimals; } + if (result.metadata.hypercharge_mode) { + result['url'] = `${result['url']}?utm_source=hypercharge-auto-hack-explorer&utm_medium=gitcoin&utm_campaign=${result['title']}`; + } + result['rounded_amount'] = normalizeAmount(result['value_in_token'], decimals); html += tmpl.render(result); diff --git a/app/dashboard/models.py b/app/dashboard/models.py index e4e2c62e921..208ac073136 100644 --- a/app/dashboard/models.py +++ b/app/dashboard/models.py @@ -1333,11 +1333,13 @@ def post_save_bounty(sender, instance, created, **kwargs): # Publish and pin on townsquare profile = Profile.objects.filter(handle=HYPERCHARGE_BOUNTIES_PROFILE_HANDLE).first() + + utm = f'utm_source=hypercharge-auto-pinned-post&utm_medium=twitter&utm_campaign={instance.title}' if profile: metadata = { 'title': title, 'description': truncatechars(instance.issue_description_text, 500), - 'url': instance.get_absolute_url(), + 'url': f'{instance.get_absolute_url()}?{utm}', 'ask': '#announce' } activity = Activity.objects.create(profile=profile, activity_type='hypercharge_bounty', diff --git a/app/dashboard/notifications.py b/app/dashboard/notifications.py index 8b48ebb0300..ddda0d8024b 100644 --- a/app/dashboard/notifications.py +++ b/app/dashboard/notifications.py @@ -156,8 +156,11 @@ def maybe_market_to_twitter(bounty, event_name): random.shuffle(tweet_txts) tweet_txt = tweet_txts[0] + utm = '' + if bounty.metadata.get('hyper_tweet_counter', False): + utm = f'utm_source=hypercharge-auto&utm_medium=twitter&utm_campaign={bounty.title}' - url = bounty.get_absolute_url() + url = f'{bounty.get_absolute_url()}?{utm}' is_short = False for shortener in ['Tinyurl', 'Adfly', 'Isgd', 'QrCx']: try: @@ -539,7 +542,7 @@ def build_github_notification(bounty, event_name, profile_pairs=None): issue_message = interest.issue_message.strip() if issue_message: msg += f"\n\n{issue_message}" - + msg += f"\n\nLearn more [on the Gitcoin Issue Details page]({absolute_url}).\n\n" elif event_name == 'work_submitted': diff --git a/app/dashboard/router.py b/app/dashboard/router.py index 15a13c647ab..daaa9b0009a 100644 --- a/app/dashboard/router.py +++ b/app/dashboard/router.py @@ -307,7 +307,7 @@ class Meta: 'fulfillment_started_on', 'fulfillment_submitted_on', 'canceled_on', 'web3_created', 'bounty_owner_address', 'avatar_url', 'network', 'standard_bounties_id', 'github_org_name', 'interested', 'token_name', 'value_in_usdt', 'keywords', 'value_in_token', 'project_type', 'is_open', 'expires_date', 'latest_activity', 'token_address', - 'bounty_categories' + 'bounty_categories', 'metadata' ) diff --git a/app/dashboard/templates/dashboard/explorer.html b/app/dashboard/templates/dashboard/explorer.html index 2a32ebe0cf3..a436e13c8b1 100644 --- a/app/dashboard/templates/dashboard/explorer.html +++ b/app/dashboard/templates/dashboard/explorer.html @@ -405,7 +405,8 @@

[[ bountyFeat.rounded_amount ]] [[ bountyFeat.token_name ]]
[[ bountyFeat.value_in_usdt ]] USD
- View Bounty + View Bounty + View Bounty diff --git a/app/marketing/management/commands/hypercharge_mode.py b/app/marketing/management/commands/hypercharge_mode.py index 251d310f8c6..e198ddf0bca 100644 --- a/app/marketing/management/commands/hypercharge_mode.py +++ b/app/marketing/management/commands/hypercharge_mode.py @@ -31,12 +31,13 @@ def make_secret_offer(profile, title, desc, bounty): + utm = f'utm_source=hypercharge-auto-secret&utm_medium=gitcoinbot&utm_campaign={bounty.title}' Offer.objects.create( created_by=profile, title=title, desc=desc, key='secret', - url=bounty.absolute_url, + url=f'{bounty.absolute_url}?{utm}', valid_from=timezone.now(), valid_to=timezone.now() + timezone.timedelta(hours=3), public=True, diff --git a/app/retail/templates/emails/bounty.html b/app/retail/templates/emails/bounty.html index dfc1a0461a3..e15a8db9aac 100644 --- a/app/retail/templates/emails/bounty.html +++ b/app/retail/templates/emails/bounty.html @@ -66,14 +66,14 @@ {{ primer }} {% elif bounty.title %} {% if bounty.value_true and bounty.token_name %} - ({{ bounty.value_true|floatformat }} {{ bounty.token_name }}) - + ({{ bounty.value_true|floatformat }} {{ bounty.token_name }}) - {% endif %} {{ bounty.title }} {% endif %}

- + {% if not small %} {% if bounty.keywords %}

@@ -137,5 +137,5 @@

{% endif %} {% endif %} - {% include 'emails/shared_bounty_actions.html' %} + {% include 'emails/shared_bounty_actions.html' with featured=featured %} diff --git a/app/retail/templates/emails/bounty_hypercharged.html b/app/retail/templates/emails/bounty_hypercharged.html index 31d32fecca2..30e1b5cc1f4 100644 --- a/app/retail/templates/emails/bounty_hypercharged.html +++ b/app/retail/templates/emails/bounty_hypercharged.html @@ -26,7 +26,7 @@

{% trans "Checkout this bounty worth" %} {{ bounty.value_true|floatformat }}

Work on "{{ bounty.title }}" and receive {{ bounty.value_true|floatformat }} {{ bounty.token_name }}

- {% trans "View on Gitcoin.co" %} + {% trans "View on Gitcoin.co" %}

diff --git a/app/retail/templates/emails/new_bounty.html b/app/retail/templates/emails/new_bounty.html index 02b4f87b109..84b292ae3c1 100644 --- a/app/retail/templates/emails/new_bounty.html +++ b/app/retail/templates/emails/new_bounty.html @@ -106,7 +106,7 @@

{{email_ann

{% trans " Featured bounties for you!" %}

{% for bounty in featured_bounties %} - {% include 'emails/bounty.html' with bounty=bounty count=forloop.counter small=1%} + {% include 'emails/bounty.html' with bounty=bounty count=forloop.counter small=1 featured=True %} {% endfor %} diff --git a/app/retail/templates/emails/shared_bounty_actions.html b/app/retail/templates/emails/shared_bounty_actions.html index 9ff55b13b85..31bba50ce18 100644 --- a/app/retail/templates/emails/shared_bounty_actions.html +++ b/app/retail/templates/emails/shared_bounty_actions.html @@ -20,7 +20,11 @@ {% else %}
- {% trans "View on Gitcoin.co" %} + {% if featured %} + {% trans "View on Gitcoin.co" %} + {% else %} + {% trans "View on Gitcoin.co" %} + {% endif %}
{% endif %} {% if action2 == 'custom' %} From 5cede857bf476f52cb8381c17b42f656d737a692 Mon Sep 17 00:00:00 2001 From: Miguel Angel G Date: Wed, 30 Sep 2020 00:06:24 -0500 Subject: [PATCH 3/4] DRY hackathonslist and change color footer on roundup --- app/app/templates/shared/hackathon-list.html | 87 +++++++++++++++++ app/assets/v2/images/social/facebook-mint.png | Bin 0 -> 1215 bytes app/assets/v2/images/social/medium-mint.png | Bin 0 -> 1555 bytes app/assets/v2/images/social/reddit-mint.png | Bin 0 -> 1724 bytes app/assets/v2/images/social/slack-mint.png | Bin 0 -> 1830 bytes app/assets/v2/images/social/twitter-mint.png | Bin 0 -> 1599 bytes .../dashboard/hackathon/hackathons.html | 89 +----------------- app/dashboard/templates/onepager/base.html | 5 + .../templates/emails/bounty_roundup.html | 23 ++++- app/retail/templates/emails/template.html | 2 + app/retail/templates/gas_history.html | 87 +---------------- 11 files changed, 118 insertions(+), 175 deletions(-) create mode 100644 app/app/templates/shared/hackathon-list.html create mode 100644 app/assets/v2/images/social/facebook-mint.png create mode 100644 app/assets/v2/images/social/medium-mint.png create mode 100644 app/assets/v2/images/social/reddit-mint.png create mode 100644 app/assets/v2/images/social/slack-mint.png create mode 100644 app/assets/v2/images/social/twitter-mint.png diff --git a/app/app/templates/shared/hackathon-list.html b/app/app/templates/shared/hackathon-list.html new file mode 100644 index 00000000000..7d67b67dcc9 --- /dev/null +++ b/app/app/templates/shared/hackathon-list.html @@ -0,0 +1,87 @@ +{% load date_fromisoformat timesince_fromisoformat %} +
+ {% if events|length %} +
+
+ {% for event in events %} + + +
+ +
+ +
+ + {% if event.logo %} + + {% else %} + + {% endif %} + +
+
+
+ + {{ event.name }} + +
+ +
+ From + + To + +
+
+

{{ event.summary }}

+
+ {% if event.sponsor_profiles|length %} +
+ Sponsored by + {% for sponsor in event.sponsor_profiles %} + + {% endfor %} +
+ {% endif %} + +
+ {% if event.end_date|timesince_fromisoformat <= "1 min" %} + + + Join + + {% endif %} + {% if event.display_showcase %} + + + + Showcase + + {% endif %} + {% if event.start_date|timesince_fromisoformat >= "1 min" and event.end_date|timesince_fromisoformat <= "1 min"%} + + + Prizes + + {% endif %} + {% if event.show_results %} + + + Projects + + {% endif %} +
+
+
+
+ {% endfor %} +
+
+ {% endif %} +
diff --git a/app/assets/v2/images/social/facebook-mint.png b/app/assets/v2/images/social/facebook-mint.png new file mode 100644 index 0000000000000000000000000000000000000000..016b5fd3db371226e0ac9426e5bdfed95a780d7c GIT binary patch literal 1215 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 U`{!J%82|tP07*qoM6N<$g07%si~s-t literal 0 HcmV?d00001 diff --git a/app/assets/v2/images/social/twitter-mint.png b/app/assets/v2/images/social/twitter-mint.png new file mode 100644 index 0000000000000000000000000000000000000000..20e03aa61871d3ea2596322fa147ec1c8149d7df GIT binary patch literal 1599 zcmV-F2Eh4=P) zdI1FDR0*fORBA%@LM5P54F}u;AxRS;vAr{WZxbhR;vYM^>)?DOXE)y2^?v8Qc{6Wj z1nP*L{k|QR)dC?}mcA?$GML*ub7$79>=c1soy~HlW*~(Ng7?r=W$S zwL7AKwDb0PU}}0gdmV879+RfjDYH^YK`Cw zhY@Eis`KBAU5JUZB&HqpCy+SbqS!iCLJiSr7uFMUOYLId&aM-~{%`St{bbO#EbHnz zS*I*o$kd%3Jp+Eq))Zwwy^yq|yjrKWW6JQ@&J#Vg3RM-=`Rvkhs-s~v5<)nx6o;K{ zmHRna=>oePgg%ExLu=b|)!AxA%8IhHL+y)gs1aPQ9NirgL;aO5mK9|+soSqJDEL8W zmFj$Uv1}w>Bg(6R1{bu97_uja)_7BiD0Vxp0c;#vVhU^Autbyj!f zh5Lo)zV6|Q_+jg3zRI$Nj!j*|Ec{!Fp~!uBlrreWHf5Hzwpj_!b@(NVR;xv-`BPuz zSkTS62ROE6KR$1I4<^vGK$4HrUKI}g&_*u96ovI}IZ(Acx1-j@duqYYJW7I^>3C)C zPnaMeykH^8R5lE`SC}aIzxRy;xUucaidJir37BwW{s9K4eHkOghu(o&SUU_U7a-UY zY_*?Sy1a(pYAsuaYu$vwm*WTo4exl^6r)J78;0DRU-0>IF163v?gbL&zWW@HSA^;H zK)`*AyiXdZ7o8M-Pfy?S`j~34z+}_A-p2%vdO@)YdQS`i;5NiB%#kW;Ogh|3NCaRk zm-UVb!?xlFzx`e{NR%?3)4noy7xiK+pG6o7T2D!(FbzWHI^4LB!=G zjRUoV0C301!lGb-^Md z`A1&BFzJw4P%l|JiU_KexLiD69wsSu8A2LQz9b~&Kb!XB$mYGib0&sI`rpp{5{)1- z$jbGrB~dCCJ4X}moaa{^;Bp#&h(2tQ_YIQ2A}oR@Svbf<1})01{I_H&r{n2`KAONd zTk9E|`JSRdE$2;sVKE#KSWJ{1wr8asC-$uTZq52s=ftIPUM_(TSX>8XyUC_@@0=6E zVw>Xj!lUi6LKgSj35?7?s>`UJ!g$Z>rPDQ{KB7rMC9NpJ(RxsJWpPdF@yD)Shvuih zMuWp{$1C^cu2ozfrL~`7x_lfB2nm`}x!i$DTM=rl`QAp@oh)^rIB8kwdezL=wZs?n zh%_1mwveR2Fj`|DldpXgc}H*H@fQyZL-ikey_q_WMOG zjx8g!PSfZ7XoyXXk?hRmg=DQox350wn+d literal 0 HcmV?d00001 diff --git a/app/dashboard/templates/dashboard/hackathon/hackathons.html b/app/dashboard/templates/dashboard/hackathon/hackathons.html index d44c89e7785..42714afb212 100644 --- a/app/dashboard/templates/dashboard/hackathon/hackathons.html +++ b/app/dashboard/templates/dashboard/hackathon/hackathons.html @@ -113,94 +113,7 @@

Build with the coolest Web3 projects

- -
- {% if events|length %} - {% load date_fromisoformat timesince_fromisoformat %} -
-
- {% for event in events %} - - -
- -
- -
- - {% if event.logo %} - - {% else %} - - {% endif %} - -
- -
-
- - {{ event.name }} - -
-
- From - - To - -
-
-

{{ event.summary }}

-
- {% if event.sponsor_profiles|length %} -
- Sponsored by - {% for sponsor in event.sponsor_profiles %} - - {% endfor %} -
- {% endif %} -
- {% if event.end_date|timesince_fromisoformat <= "1 min" %} - - - Join - - {% endif %} - {% if event.display_showcase %} - - - - Showcase - - {% endif %} - {% if event.start_date|timesince_fromisoformat >= "1 min" and event.end_date|timesince_fromisoformat <= "1 min"%} - - - Prizes - - {% endif %} - {% if event.show_results %} - - - Projects - - {% endif %} -
-
-
-
- {% endfor %} -
-
- {% endif %} -
- + {% include 'shared/hackathon-list.html' %} {% include 'shared/analytics.html' %} {% include 'shared/footer_scripts.html' %} diff --git a/app/dashboard/templates/onepager/base.html b/app/dashboard/templates/onepager/base.html index a32b952255b..06245e49330 100644 --- a/app/dashboard/templates/onepager/base.html +++ b/app/dashboard/templates/onepager/base.html @@ -55,6 +55,11 @@ .select2-container--default .select2-selection--single .select2-selection__arrow { height: 32px; } + + img.hackathon-card-logo { + max-height: 12rem; + max-width: 9rem; + }