GITC-102: Hackathons landing page (developers) refresh

app/app/bundle_context.py

@@ -21,6 +21,7 @@
 from cacheops import cached_as
 from perftools.models import JSONStore
 
+
 @cached_as(JSONStore.objects.filter(view='bundleTags', key='bundleTags'), timeout=60)
 def templateTags():
 

app/assets/v2/js/bubbles.js

@@ -0,0 +1,108 @@
+document.addEventListener('DOMContentLoaded', () => {
+  // configure the bubbles
+  const SCROLL_SPEED = 0.3;
+  const NOISE_SPEED = 0.004;
+  const NOISE_AMOUNT = 5;
+  const CANVAS_WIDTH = 2800;
+  const bubblesEl = document.querySelector('.bubbles');
+  const bubbleSpecs = [
+    { s: .6, x: 1134, y: 45 },
+    { s: .6, x: 1620, y: 271 },
+    { s: .6, x: 1761, y: 372 },
+    { s: .6, x: 2499, y: 79 },
+    { s: .6, x: 2704, y: 334 },
+    { s: .6, x: 2271, y: 356 },
+    { s: .6, x: 795, y: 226 },
+    { s: .6, x: 276, y: 256 },
+    { s: .6, x: 1210, y: 365 },
+    { s: .6, x: 444, y: 193 },
+    { s: .6, x: 2545, y: 387 },
+    { s: .8, x: 1303, y: 193 },
+    { s: .8, x: 907, y: 88 },
+    { s: .8, x: 633, y: 320 },
+    { s: .8, x: 323, y: 60 },
+    { s: .8, x: 129, y: 357 },
+    { s: .8, x: 1440, y: 342 },
+    { s: .8, x: 1929, y: 293 },
+    { s: .8, x: 2135, y: 198 },
+    { s: .8, x: 2276, y: 82 },
+    { s: .8, x: 2654, y: 182 },
+    { s: .8, x: 2783, y: 60 },
+    { x: 1519, y: 118 },
+    { x: 1071, y: 233 },
+    { x: 1773, y: 148 },
+    { x: 2098, y: 385 },
+    { x: 2423, y: 244 },
+    { x: 901, y: 385 },
+    { x: 624, y: 111 },
+    { x: 75, y: 103 },
+    { x: 413, y: 367 },
+    { x: 2895, y: 271 },
+    { x: 1990, y: 75 }
+  ];
+
+  class Bubbles {
+    constructor(specs) {
+      this.bubbles = [];
+
+      specs.forEach((spec, index) => {
+        this.bubbles.push(new Bubble(index, spec));
+      });
+
+      requestAnimationFrame(this.update.bind(this));
+      bubblesEl.style.opacity = 1;
+    }
+
+    update() {
+      this.bubbles.forEach(bubble => bubble.update());
+      this.raf = requestAnimationFrame(this.update.bind(this));
+    }
+  }
+
+  class Bubble {
+    constructor(index, {
+      x,
+      y,
+      s = 1
+    }) {
+      this.index = index;
+      this.x = x;
+      this.y = y;
+      this.scale = s;
+
+      this.noiseSeedX = Math.floor(Math.random() * 64000);
+      this.noiseSeedY = Math.floor(Math.random() * 64000);
+      this.el = bubblesEl.children[index];
+      if (!this.el) {
+        return;
+      }
+
+      this.el.classList.add(`logo${this.index + 1}`);
+    }
+
+    update() {
+      if (!this.el) {
+        return;
+      }
+      this.noiseSeedX += NOISE_SPEED;
+      this.noiseSeedY += NOISE_SPEED;
+      let randomX = noise.simplex2(this.noiseSeedX, 0);
+      let randomY = noise.simplex2(this.noiseSeedY, 0);
+
+      this.x -= SCROLL_SPEED;
+      this.xWithNoise = this.x + (randomX * NOISE_AMOUNT);
+      this.yWithNoise = this.y + (randomY * NOISE_AMOUNT);
+
+      if (this.x < -200) {
+        this.x = CANVAS_WIDTH;
+      }
+
+      this.el.style.transform = `translate(${this.xWithNoise}px, ${this.yWithNoise}px) scale(${this.scale})`;
+    }
+  }
+
+  noise.seed(Math.floor(Math.random() * 64000));
+
+  // init the bubbles
+  const bubbles = new Bubbles(bubbleSpecs);
+});

app/assets/v2/js/pages/hackathon-list.js

@@ -1,20 +1,48 @@
-$(document).ready(function() {
-  $(document).on('click', '#tabs a', function(e) {
-    e.preventDefault();
-    let target = $(this).data('href');
+document.addEventListener('DOMContentLoaded', () => {
 
-    $('.hackathons-list').addClass('hidden');
-    $('.nav-link').removeClass('active');
-    $('.nav-link').css('font-weight', '');
-    $(this).addClass('active');
-    $(this).css('font-weight', '700');
+  const tabs = document.querySelectorAll('.hackathon-tabs a');
+  const hacks = document.querySelectorAll('.hackathon-list');
 
+  const loadTab = (target) => {
+    let hiddenRows = false;
 
-    $('.hackathon-list').addClass('hidden');
-    $('.hackathon-list.' + target).removeClass('hidden');
+    const hack = document.querySelector('.hackathon-list.' + target);
+    const rows = document.querySelectorAll('.hackathon-list.' + target + ' > .row');
+    const more = document.querySelector('.hackathon-list.' + target + ' > .view-more');
 
-    $('html,body').animate({
-      scrollTop: '+=1px'
+    tabs.forEach((t) => t.classList.remove('active'));
+    document.querySelector('.nav-link[data-href="' + target + '"]').classList.add('active');
+
+    hacks.forEach((hack) => hack.classList.add('hidden'));
+    hack.classList.remove('hidden');
+
+    rows.forEach((row, indx) => {
+      if (indx > 1 && more.classList.contains('d-none')) {
+        hiddenRows = true;
+        row.classList.add('d-none');
+      }
+    });
+
+    if (hiddenRows && more) {
+      const newMore = more.cloneNode(true);
+
+      more.parentNode.replaceChild(newMore, more);
+      newMore.classList.add('d-block');
+      newMore.classList.remove('d-none');
+      newMore.addEventListener('click', () => {
+        newMore.classList.add('d-none');
+        newMore.classList.remove('d-block');
+        rows.forEach((hack) => hack.classList.remove('d-none'));
+      });
+    }
+  };
+
+  tabs.forEach((tab) => {
+    tab.addEventListener('click', (e) => {
+      e.preventDefault();
+      loadTab(e.target.dataset.href);
     });
   });
+
+  loadTab(document.default_tab);
 });

app/assets/v2/scss/gc-utilities.scss

@@ -82,6 +82,10 @@
   background-color: $gc-grey-100;
 }
 
+.bg-violet-100 {
+  background-color: $gc-violet-100;
+}
+
 .bg-violet-300 {
   background-color: $gc-violet-300;
 }
@@ -90,6 +94,10 @@
   background-color: $gc-violet-400;
 }
 
+.bg-teal-300 {
+  background-color: $gc-teal-300;
+}
+
 .bg-pink-300 {
   background-color: $gc-pink-300;
 }

app/assets/v2/scss/gitcoin.scss

@@ -555,7 +555,7 @@
 }
 
 .nav-tabs .nav-line {
-  color: #6F3FF5;
+  color: $gc-grey-500;
   border-width: 0px 0px 3px 0;
 }
 .nav-tabs .nav-line.active {

app/dashboard/admin.py

@@ -25,6 +25,7 @@
 from django.utils.safestring import mark_safe
 
 from adminsortable2.admin import SortableInlineAdminMixin
+from perftools.management.commands import create_page_cache
 
 from .models import (
     Activity, Answer, BlockedIP, BlockedURLFilter, BlockedUser, Bounty, BountyEvent, BountyFulfillment, BountyInvites,
@@ -35,7 +36,6 @@
     TransactionHistory, TribeMember, TribesSubscription, UserAction, UserVerificationModel,
 )
 
-from perftools.management.commands import create_page_cache
 
 class BountyEventAdmin(admin.ModelAdmin):
     list_display = ['created_on', '__str__', 'event_type']

app/dashboard/gas_views.py

@@ -246,11 +246,16 @@ def gas_history_view(request):
     events = JSONStore.objects.get(key='hackathons', view='hackathons').data[1]
     default_tab = 'current'
 
+    num_current = len([ele for ele in events if ele['type'] == 'current'])
+    num_upcoming = len([ele for ele in events if ele['type'] == 'upcoming'])
+    num_finished = len([ele for ele in events if ele['type'] == 'finished'])
+
     tabs = [
-        ('current', 'happening now'),
-        ('upcoming', 'upcoming'),
-        ('finished', 'completed'),
+        ('current', 'happening now', num_current),
+        ('upcoming', 'upcoming', num_upcoming),
+        ('finished', 'completed', num_finished),
     ]
+
     context = {
         'title': _('Live Ethereum (ETH) Gas History'),
         'card_desc': _('See and comment on the Ethereum (ETH) Gas - Hourly History Graph'),
@@ -262,6 +267,7 @@ def gas_history_view(request):
         'granularity_options': granularity_options,
         'events': events,
         'tabs': tabs,
+        'types': ['current', 'upcoming', 'finished'],
         'default_tab': default_tab
     }
     return TemplateResponse(request, 'gas_history.html', context)

app/dashboard/management/commands/bundle.py

@@ -7,9 +7,8 @@
 from django.template import Context, Template
 from django.template.loaders.app_directories import get_app_template_dirs
 
-from dashboard.templatetags.bundle import render
-
 from app.bundle_context import context, templateTags
+from dashboard.templatetags.bundle import render
 
 
 def rmdir(loc, depth=1):

app/dashboard/migrations/0184_hackathonevent_total_prize.py

@@ -0,0 +1,18 @@
+# Generated by Django 2.2.24 on 2021-07-17 03:53
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('dashboard', '0183_auto_20210701_1339'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='hackathonevent',
+            name='total_prize',
+            field=models.CharField(blank=True, help_text='extra text to display next the event dates on the hackathon list page', max_length=255, null=True),
+        ),
+    ]

app/dashboard/models.py

@@ -5052,6 +5052,7 @@ class HackathonEvent(SuperModel):
     chat_channel_id = models.CharField(max_length=255, blank=True, null=True)
     use_circle = models.BooleanField(help_text=_('Use circle for the Hackathon'), default=False)
     visible = models.BooleanField(help_text=_('Can this HackathonEvent be seeing on /hackathons ?'), default=True)
+    total_prize = models.CharField(max_length=255, null=True, blank=True, help_text='extra text to display next the event dates on the hackathon list page')
 
     default_channels = ArrayField(models.CharField(max_length=255), blank=True, default=list)
     objects = HackathonEventQuerySet.as_manager()