finish new hackthon section;move subscription section

Author: walidmujahid

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

@@ -8,6 +8,9 @@ $(document).ready(function() {
     $('.nav-link').css('font-weight', '');
     $(this).addClass('active');
     $(this).css('font-weight', '700');
+
+
+    $('.hackathon-list').addClass('hidden');
     $('.hackathon-list.' + target).removeClass('hidden');
 
     $('html,body').animate({

app/dashboard/templates/dashboard/hackathon/hackathons.html

@@ -38,10 +38,12 @@
       {% include 'shared/nav_hackathons.html' %}
       {% include 'shared/minihero.html' with h1='Hackathons' suppress_logo=0 position_h1_below_logo=True hide_rain=True %}
 
-      <div class="row justify-content-md-center">
-        <form action="//consensys.us11.list-manage.com/subscribe/post?u=947c9b18fc27e0b00fc2ad055&amp;id=b1d45ffdfe"
-          method="post" id="mc-embedded-subscribe-form" class="col-12 col-md-6 text-center white pb-5 px-5" name="mc-embedded-subscribe-form" target="_blank">
-          <label for="newsletter-input" class="text-uppercase">{% trans "Signup to get hackathon updates" %}</label>
+    </div>
+
+    <div class="container">
+      <div class="rounded row justify-content-md-center my-5" style="background-color:#0D0665;">
+        <form action="//consensys.us11.list-manage.com/subscribe/post?u=947c9b18fc27e0b00fc2ad055&amp;id=b1d45ffdfe" method="post" id="mc-embedded-subscribe-form" class="col-12 col-md-6 text-center white pb-5 pt-4 px-5" name="mc-embedded-subscribe-form" target="_blank">
+          <label for="newsletter-input">{% trans "Subscribe to get Hackathon news upcoming hackathons!" %}</label>
           <div class="form-row pt-1">
             <div class="col">
               <input name="EMAIL" id="newsletter-input" class="form-control" placeholder="Enter your email" required>
@@ -50,30 +52,22 @@
           </div>
         </form>
       </div>
-    </div>
-    <div class="container-fluid">
-    </div>
 
-    <div class="container">
-      <div id="tabs" class="row my-5">
+      <div id="tabs" class="row my-4">
         <div class="container">
           <ul class="nav nav-tabs mt-3" id="myTab" role="tablist">
-            <li class="nav-item">
-              <a class="nav-link nav-line active" href="#" data-href="{{ tabs.current.href }}" style="font-weight: 700;">{{ tabs.current.title }} <sup>({{ tabs.current.event_count }})</sup></a>
-            </li>
-            <li class="nav-item">
-              <a class="nav-link nav-line" href="#" data-href="{{ tabs.upcoming.href }}">{{ tabs.upcoming.title }} <sup>({{ tabs.upcoming.event_count }})</sup></a>
-            </li>
-            <li class="nav-item">
-              <a class="nav-link nav-line" href="#" data-href="{{ tabs.finished.href }}">{{ tabs.finished.title }} <sup>({{ tabs.finished.event_count }})</sup></a>
-            </li>
+            {% for title, hackathons in events.items %}
+              <li class="nav-item">
+                <a class="nav-link nav-line {% if title == 'current' %}active{% endif %}" href="#" data-href="{{ title }}" style="{% if title == 'current' %}font-weight: 700;{% endif %}">{{ title|title }} ({{ hackathons|length }})</a>
+              </li>
+            {% endfor %}
           </ul>
         </div>
       </div>
 
+      <div class="row my-4">
       {% for title, hackathons in events.items %}
       {% if hackathons|length %}
-      <div class="row my-5">
         {% for hackathon in hackathons %}
         <style>
           #{{hackathon.slug}} .card-img-top {
@@ -82,7 +76,7 @@
         </style>
 
 
-        <div class="col-xs-12 col-sm-6 col-lg-4">
+        <div class="col-xs-12 col-sm-6 col-lg-4 hackathon-list {{ title }} {% if title != 'current' %}hidden{% endif %}">
           <div class="card mb-5" id="{{hackathon.slug}}">
             {% firstof hackathon.logo_svg or hackathon.logo as logo %}
             {% if logo %}
@@ -115,9 +109,11 @@ <h5 class="card-title"><a href="{% url 'hackathon' hackathon.slug %}">{{ hackath
           </div>
         </div>
         {% endfor %}
-        </div>
       {% endif %}
       {% endfor %}
+      </div>
+
+      
     </div>
     {% include 'shared/analytics.html' %}
     {% include 'shared/footer_scripts.html' %}

app/dashboard/views.py

@@ -4110,25 +4110,7 @@ def hackathon_registration(request):
 
 def get_hackathons(request):
     """Handle rendering all Hackathons."""
-
-    tabs = {
-        'current': {
-            'title': 'Current',
-            'event_count': HackathonEvent.objects.current().order_by('-start_date').count(),
-            'href': 'current'
-        },
-        'upcoming': {
-            'title': 'Upcoming',
-            'event_count': HackathonEvent.objects.upcoming().order_by('-start_date').count(),
-            'href': 'upcoming'
-        },
-        'finished': {
-            'title': 'Finished',
-            'event_count': HackathonEvent.objects.finished().order_by('-start_date').count(),
-            'href': 'finished'
-        }
-    }
-
+    
     events = {
         'current': HackathonEvent.objects.current().filter(visible=True).order_by('-start_date'),
         'upcoming': HackathonEvent.objects.upcoming().filter(visible=True).order_by('-start_date'),
@@ -4139,7 +4121,6 @@ def get_hackathons(request):
         'title': 'Hackathons',
         'card_desc': "Gitcoin runs Virtual Hackathons. Learn, earn, and connect with the best hackers in the space -- only on Gitcoin.",
         'events': events,
-        'tabs': tabs,
     }
     return TemplateResponse(request, 'dashboard/hackathon/hackathons.html', params)