From a79af3a16e4deddcfd4fe702fcd7e340c6f4a429 Mon Sep 17 00:00:00 2001
From: octavioamu <octavioamuchastegui@gmail.com>
Date: Tue, 14 Apr 2020 18:07:08 -0300
Subject: [PATCH 1/8] fix hackathon backgrounds

---
 .../templates/dashboard/index-vue.html        | 19 ++++++++++++-------
 app/dashboard/views.py                        |  1 -
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/app/dashboard/templates/dashboard/index-vue.html b/app/dashboard/templates/dashboard/index-vue.html
index 7969821e2f7..5ad12d73c64 100644
--- a/app/dashboard/templates/dashboard/index-vue.html
+++ b/app/dashboard/templates/dashboard/index-vue.html
@@ -137,20 +137,25 @@
         bottom:0;
       }
 
-      .hackathon-banner {
+      /* .hackathon-banner {
         background: {% firstof hackathon.background_color or 'white' %};
         color: {% firstof hackathon.text_color or 'black' %};
         height: 225px;
         background-image: url('{% firstof banner or "/static/wallpapers/V3.png" %}');
+      } */
+      .hackathon-banner {
+        background: {% firstof hackathon.background_color or 'white' %};
+        color: {% firstof hackathon.text_color or 'black' %};
+        height: 225px;
+        {% if hackathon.banner %}
+          background: url('{{MEDIA_URL}}{{hackathon.banner}}') 0 / cover;
+        {% endif %}
       }
 
       .bounty_row img.avatar {
         max-width: 50px;
       }
 
-      .hackathon-text {
-          color: white;
-      }
       .hackathon-title {
           font-size: 1.4rem;
       }
@@ -178,9 +183,9 @@
           max-height: 240px;
           width: 240px;
           max-width: 240px;
-          background-color: #090E60;
+          background: {% firstof hackathon.background_color or '#090E60' %};
           border-radius: 10px;
-          color: white;
+          color: {% firstof hackathon.text_color or 'black' %};
           display: flex;
           flex-direction: column;
           justify-content: center;
@@ -298,7 +303,7 @@
       <a style="color:white;" href="{{hackathon.admin_url}}">{% trans "Hackathon Admin" %}</a>
     </div>
     {% endif %}
-    
+
     <div id="dashboard-content" class="container-fluid no-gutter" style="min-height:600px;">
         <div id="dashboard-vue-app" class="row" v-cloak>
           <div :id="hackathonObj.identifier" class="d-flex col-12 justify-content-between flex-column flex-md-row align-items-center p-3 banner hackathon-banner">
diff --git a/app/dashboard/views.py b/app/dashboard/views.py
index 26d697853b1..12c8bee6e13 100644
--- a/app/dashboard/views.py
+++ b/app/dashboard/views.py
@@ -3779,7 +3779,6 @@ def hackathon(request, hackathon='', panel='prizes'):
         'SHOW_DRESSING': False,
         'use_pic_card': True,
         'projects': [],
-        'banner': f"/media/{hackathon_event.banner}" if hackathon_event.banner else None,
         'panel': active_tab
     }
 

From 7ca334c28773703c5a4a09dec01b2c501b9e80d6 Mon Sep 17 00:00:00 2001
From: octavioamu <octavioamuchastegui@gmail.com>
Date: Tue, 14 Apr 2020 20:17:52 -0300
Subject: [PATCH 2/8] fix hackathon bg, add register btn, remove redirect

---
 app/app/urls.py                               |  4 ++
 .../dashboard/hackathon/onboard.html          | 25 +++++++-----
 .../templates/dashboard/index-vue.html        | 40 +++++++++++--------
 app/dashboard/templates/dashboard/index.html  |  5 ++-
 .../dashboard/sidebar_search_hackathon.html   |  3 ++
 app/dashboard/views.py                        |  4 +-
 6 files changed, 51 insertions(+), 30 deletions(-)

diff --git a/app/app/urls.py b/app/app/urls.py
index d26118a881c..03f568a0bc1 100644
--- a/app/app/urls.py
+++ b/app/app/urls.py
@@ -209,8 +209,12 @@
 
     # Hackathons / special events
     path('hackathon/<str:hackathon>/', dashboard.views.hackathon, name='hackathon'),
+    path('hackathon/<str:hackathon>', dashboard.views.hackathon, name='hackathon2'),
+    path('hackathon/<str:hackathon>/onboard/', dashboard.views.hackathon_onboard, name='hackathon_onboard2'),
     path('hackathon/<str:hackathon>/<str:panel>/', dashboard.views.hackathon, name='hackathon'),
     path('hackathon/<str:hackathon>/onboard', dashboard.views.hackathon_onboard, name='hackathon_onboard'),
+    path('hackathon/onboard/<str:hackathon>', dashboard.views.hackathon_onboard, name='hackathon_onboard2'),
+    path('hackathon/onboard/<str:hackathon>/', dashboard.views.hackathon_onboard, name='hackathon_onboard3'),
     path('hackathon/<str:hackathon>/projects/', dashboard.views.hackathon_projects, name='hackathon_projects'),
     path('hackathon/<str:hackathon>/prizes/', dashboard.views.hackathon, name='hackathon_prizes'),
     path(
diff --git a/app/dashboard/templates/dashboard/hackathon/onboard.html b/app/dashboard/templates/dashboard/hackathon/onboard.html
index 2d9756b55d9..73a53abb19c 100644
--- a/app/dashboard/templates/dashboard/hackathon/onboard.html
+++ b/app/dashboard/templates/dashboard/hackathon/onboard.html
@@ -37,9 +37,14 @@
         width: 100%;
       }
       .onboard-banner {
+        position: relative;
         background: {% firstof hackathon.background_color or 'white' %};
         color: {% firstof hackathon.text_color or 'black' %};
+        {% if hackathon.banner %}
+          background: url('{{MEDIA_URL}}{{hackathon.banner}}') 0 / cover;
+        {% endif %}
       }
+
     </style>
   </head>
   <body class="interior {{active}} g-font-muli">
@@ -47,16 +52,16 @@
     <div class="container-fluid header dash">
       {% include 'shared/top_nav.html' with class='d-md-flex' %}
       {% include 'shared/nav_hackathons.html' %}
-      <div class="onboard-banner text-center p-4 pb-5">
-        {% firstof hackathon.logo_svg or hackathon.logo as logo %}
-        {% if logo %}
-          <img class="my-5 mw-100" height="250" src="{{MEDIA_URL}}{{logo}}"/>
-        {% else %}
-          <div class=" d-flex align-items-center justify-content-around font-bigger-4 text-center my-5">
-            {{ hackathon.name }}
-          </div>
-        {% endif %}
-      </div>
+    </div>
+    <div class="onboard-banner text-center p-4 pb-5">
+      {% firstof hackathon.logo_svg or hackathon.logo as logo %}
+      {% if logo %}
+        <img class="my-5 mw-100" height="250" src="{{MEDIA_URL}}{{logo}}"/>
+      {% else %}
+        <div class=" d-flex align-items-center justify-content-around font-bigger-4 text-center my-5">
+          {{ hackathon.name }}
+        </div>
+      {% endif %}
     </div>
 
     <div class="container-fluid bg-lightblue pb-5">
diff --git a/app/dashboard/templates/dashboard/index-vue.html b/app/dashboard/templates/dashboard/index-vue.html
index 5ad12d73c64..1b20ff33ac9 100644
--- a/app/dashboard/templates/dashboard/index-vue.html
+++ b/app/dashboard/templates/dashboard/index-vue.html
@@ -395,27 +395,26 @@ <h3>{% trans "No results found." %}</h3>
                         {% endfor %}
                       </div>
                     </div>
-                  <div class="feed_container col-12 col-lg-8">
-                    <div class="feed_container_child">
-                      {% csrf_token %}
-                      {% include 'townsquare/shared/shareactivity.html' %}
-
-                      <div id="activities" class="activity_stream {% if not is_search %}mt-4{% endif %}">
-                        <span id=activity_subheader>
-                          <img class="loading" src="/static/v2/images/loading_v2.gif" style="max-width: 200px; margin: 0px auto; display: block;">
-                          <br>
-                          <span>
-                            {{card_desc}}
+                    <div class="feed_container col-12 col-lg-8">
+                      <div class="feed_container_child">
+                        {% csrf_token %}
+                        {% include 'townsquare/shared/shareactivity.html' %}
+
+                        <div id="activities" class="activity_stream {% if not is_search %}mt-4{% endif %}">
+                          <span id=activity_subheader>
+                            <img class="loading" src="/static/v2/images/loading_v2.gif" style="max-width: 200px; margin: 0px auto; display: block;">
+                            <br>
+                            <span>
+                              {{card_desc}}
+                            </span>
                           </span>
-                        </span>
-                        {% include 'shared/activity_container.html' %}
+                          {% include 'shared/activity_container.html' %}
+                        </div>
                       </div>
                     </div>
+                    <div class="actions_container col-12 col-md-2 offset-1">
+                    </div>
                   </div>
-                  <div class="actions_container col-12 col-md-2 offset-1">
-                  </div>
-              </div>
-
                 </div>
               </b-tab>
               <project-directory inline-template>
@@ -857,6 +856,13 @@ <h6 class="font-weight-bold mb-3">Invite [[numUsers]] Users to the Bounty</h6>
                   </div>
                 </b-tab>
               </user-directory>
+              <template v-slot:tabs-end>
+                <li role="presentation" class="nav-item navigation"><a href="{% url 'hackathon_onboard' hackathon.slug %}" class="text-reset text-decoration-none nav-link">
+                  <div class="mt-4">
+                    Guide
+                  </div>
+                </a></li>
+              </template>
             </b-tabs>
           </div>
           <div class="col-12 col-md-3">
diff --git a/app/dashboard/templates/dashboard/index.html b/app/dashboard/templates/dashboard/index.html
index 111e992d41e..ebffeb7cd09 100644
--- a/app/dashboard/templates/dashboard/index.html
+++ b/app/dashboard/templates/dashboard/index.html
@@ -42,11 +42,14 @@
       <link rel="stylesheet" href={% static "v2/css/hackathons/explorer.css" %}>
 
       <style>
+
         .hackathon-banner {
           background: {% firstof hackathon.background_color or 'white' %};
           color: {% firstof hackathon.text_color or 'black' %};
           height: 225px;
-          background-image: url("/static/wallpapers/V3.png");
+          {% if hackathon.banner %}
+            background: url('{{MEDIA_URL}}{{hackathon.banner}}') 0 / cover;
+          {% endif %}
         }
 
         .hackathon-text {
diff --git a/app/dashboard/templates/dashboard/sidebar_search_hackathon.html b/app/dashboard/templates/dashboard/sidebar_search_hackathon.html
index bb17941b549..1e37b5fd1f2 100644
--- a/app/dashboard/templates/dashboard/sidebar_search_hackathon.html
+++ b/app/dashboard/templates/dashboard/sidebar_search_hackathon.html
@@ -29,6 +29,9 @@
     <div class="col">
 
     {% if hackathon %}
+      {% if not is_registered %}
+        <a href="{% url 'hackathon_onboard' hackathon.slug %}" class="btn btn-gc-blue btn-block text-uppercase mb-4">Register</a>
+      {% endif %}
       <div class="col-12 subheading left-ribbon">
         {% trans "Hackathon Sponsors" %}
       </div>
diff --git a/app/dashboard/views.py b/app/dashboard/views.py
index 12c8bee6e13..9aeefa2569d 100644
--- a/app/dashboard/views.py
+++ b/app/dashboard/views.py
@@ -3744,8 +3744,8 @@ def hackathon(request, hackathon='', panel='prizes'):
         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,)))
+    # 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,)))
 
     view_tags = get_tags(request)
     active_tab = 0

From ec302a623042486fe9bcc71c39bf61e5851fc59e Mon Sep 17 00:00:00 2001
From: octavioamu <octavioamuchastegui@gmail.com>
Date: Tue, 14 Apr 2020 20:48:11 -0300
Subject: [PATCH 3/8] fix registration boolean

---
 app/dashboard/views.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/dashboard/views.py b/app/dashboard/views.py
index 9aeefa2569d..586fdb935e0 100644
--- a/app/dashboard/views.py
+++ b/app/dashboard/views.py
@@ -3772,7 +3772,7 @@ def hackathon(request, hackathon='', panel='prizes'):
         'keywords': json.dumps([str(key) for key in Keyword.objects.all().values_list('keyword', flat=True)]),
         'hackathon': hackathon_event,
         'hackathon_obj': HackathonEventSerializer(hackathon_event).data,
-        'is_registered': 1 if len(is_registered) > 0 else 0,
+        'is_registered': json.dumps(True if is_registered else False),
         'user': request.user,
         'tags': view_tags,
         'activities': [],

From a7e9cf4d62c9a7dd944bf9cf465485a92cb8fd64 Mon Sep 17 00:00:00 2001
From: octavioamu <octavioamuchastegui@gmail.com>
Date: Tue, 14 Apr 2020 23:47:10 -0300
Subject: [PATCH 4/8] fix prize visibility and tribes cards

---
 .../templates/dashboard/index-vue.html        | 103 ++++++++++--------
 app/dashboard/views.py                        |   6 +-
 2 files changed, 64 insertions(+), 45 deletions(-)

diff --git a/app/dashboard/templates/dashboard/index-vue.html b/app/dashboard/templates/dashboard/index-vue.html
index 1b20ff33ac9..4cbf612ab9b 100644
--- a/app/dashboard/templates/dashboard/index-vue.html
+++ b/app/dashboard/templates/dashboard/index-vue.html
@@ -86,12 +86,6 @@
         width: 4em;
       }
 
-      #sponsor_sidebar .b-avatar {
-        position: relative;
-        left: 3rem;
-        top: 2.5rem;
-      }
-
       .b-avatar img {
         height: 100%;
         width: 100%;
@@ -341,35 +335,59 @@
                     </div>
                   </div>
                   <div class="col-12 col-md-9 p-2 ml-sm-4">
-                    <div class="px-2" id="bounties">
-                      <div id="dashboard-title" class="hidden">
-                        {% include 'shared/search_bar.html' %}
+                    {% if not prize_blocked %}
+                      <div class="px-2" id="bounties">
+                        <div id="dashboard-title" class="hidden">
+                          {% include 'shared/search_bar.html' %}
+                        </div>
                       </div>
-                    </div>
-                    <div class="row loading justify-content-center align-items-center loading_img">
-                      <img src="{% static "v2/images/loading_v2.gif" %}" alt="Loading ...">
-                    </div>
-                    <div class="row nonefound mx-auto" style="display:none;">
-                  {% if hackathon %}
-                    <h1 class="font-title font-weight-semibold">Hackathon Coming Soon!</h1>
-                    <img class="my-3" src="{% static "v2/images/obiwan-bot.svg" %}" alt="Obiwan bot">
-                    <p>
-                      <a href="{% url "quests_index" %}">Explore Web3 via Gitcoin Quests to prepare</a>
-                    </p>
-                    {% include 'shared/hackathon_sponsors.html' %}
-
-                  {% else %}
-                    <img class="my-3" src="{% static "v2/images/obiwan-bot.svg" %}" alt="Obiwan bot">
-                    <h3>{% trans "No results found." %}</h3>
-                    <p>{% trans "Request an organisation to fund an issue" %}</p>
-                    <div class="mt-3">
-                      <a class="button button--primary py-2 font-weight-semibold" role="button" href="/requests">
-                        {% trans "REQUEST BOUNTY" %}
-                      </a>
-                    </div>
-                  {% endif %}
-                </div>
-                    {% include 'dashboard/featured_bounties.html' %}
+                      <div class="row loading justify-content-center align-items-center loading_img">
+                        <img src="{% static "v2/images/loading_v2.gif" %}" alt="Loading ...">
+                      </div>
+                      <div class="row nonefound mx-auto" style="display:none;">
+                        {% if hackathon %}
+                          <h1 class="font-title font-weight-semibold">Hackathon Coming Soon!</h1>
+                          <img class="my-3" src="{% static "v2/images/obiwan-bot.svg" %}" alt="Obiwan bot">
+
+                          {% if hackathon.quest_link %}
+                            <p>Explore Web3 and be prepared via sponsors Quests</p>
+                            <a class="btn btn-gc-blue" href="{{hackathon.quest_link}}">Explore Quests</a>
+                          {% elif hackathon.start_date|timesince <= "1 min" %}
+                            <p>Explore Web3 via Gitcoin Quests to prepare</p>
+                            <a class="btn btn-gc-blue" href="{% url 'quests_index' %}">Explore Quests</a>
+                          {% endif %}
+
+                          {% include 'shared/hackathon_sponsors.html' %}
+
+                        {% else %}
+                          <img class="my-3" src="{% static "v2/images/obiwan-bot.svg" %}" alt="Obiwan bot">
+                          <h3>{% trans "No results found." %}</h3>
+                          <p>{% trans "Request an organisation to fund an issue" %}</p>
+                          <div class="mt-3">
+                            <a class="button button--primary py-2 font-weight-semibold" role="button" href="/requests">
+                              {% trans "REQUEST BOUNTY" %}
+                            </a>
+                          </div>
+                        {% endif %}
+                      </div>
+                      {% include 'dashboard/featured_bounties.html' %}
+                    {% else %}
+                      <div class="text-center mx-auto">
+                        <h1 class="font-title font-weight-semibold">Hackathon Coming Soon!</h1>
+                        <img class="my-3" src="{% static "v2/images/obiwan-bot.svg" %}" alt="Obiwan bot">
+
+                        {% if hackathon.quest_link %}
+                          <p>Explore Web3 and be prepared via sponsors Quests</p>
+                          <a class="btn btn-gc-blue" href="{{hackathon.quest_link}}">Explore Quests</a>
+                        {% else %}
+                          <p>Explore Web3 via Gitcoin Quests to prepare</p>
+                          <a class="btn btn-gc-blue" href="{% url 'quests_index' %}">Explore Quests</a>
+                        {% endif %}
+                      </div>
+
+                      {% include 'shared/hackathon_sponsors.html' %}
+                    {% endif %}
+
                   </div>
                 </div>
               </b-tab>
@@ -874,18 +892,17 @@ <h6 class="font-weight-bold mb-3">Invite [[numUsers]] Users to the Bounty</h6>
                     {% trans "Sponsor Tribes" %}
                   </div>
                   <ul class="list-unstyled">
-                    <b-media v-for="sponsor in tribesData" tag="li"  class="p-3">
+                    <b-media v-for="sponsor in tribesData" tag="li"  class="bg-white rounded m-4" vertical-align="center">
                       <template v-slot:aside>
-                        <b-avatar :src="sponsor.avatar_url" size="64" :alt="sponsor.org_name"></b-avatar>
+                        <b-avatar :src="sponsor.avatar_url" size="46" :alt="sponsor.org_name" class="ml-n3"></b-avatar>
                       </template>
-                      <div class="row px-5 py-3">
-                        <div class="col-6 offset-2">
-                          <h5 class="mt-0 mb-1">[[ sponsor.org_name ]]</h5>
+                      <div class="py-3 pr-3">
+                        <div class="d-flex justify-content-between">
+                          <a class="mb-1 font-bigger-1 text-truncate w-50" :href="`/profile/${sponsor.org_name}`">[[ sponsor.display_name ]]</a>
+                          <b-button variant="outline-primary" @click="followTribe(sponsor.org_name, $event)" class="btn-sm btn-outline-gc-blue">[[ sponsor.followed ? "unfollow" : "follow" ]]</b-button>
                         </div>
-                        <div class="col-2 offset-2">
-                          <b-button variant="outline-primary" @click="followTribe(sponsor.org_name, $event)" class="btn-outline-gc-blue">[[ sponsor.followed ? "unfollow" : "follow" ]]</b-button>
-                        </div>
-                        <div class="col-8 offset-1">
+
+                        <div class="">
                           <ul class="list-unstyled" class="mb-0">
                             <li><i class="fas fa-fw fa-user"></i> [[ sponsor.follower_count ]] Followers</li>
                             <li><i class="fas fa-fw fa-trophy"></i> [[ sponsor.bounty_count ]] Bounties Funded</li>
diff --git a/app/dashboard/views.py b/app/dashboard/views.py
index 586fdb935e0..e5d88da06a0 100644
--- a/app/dashboard/views.py
+++ b/app/dashboard/views.py
@@ -3716,8 +3716,9 @@ def hackathon(request, hackathon='', panel='prizes'):
 
     title = hackathon_event.name.title()
     network = get_default_network()
-    if timezone.now() < hackathon_event.start_date and not request.user.is_staff:
-        return redirect(reverse('hackathon_onboard', args=(hackathon_event.slug,)))
+    hackathon_not_started = timezone.now() < hackathon_event.start_date and not request.user.is_staff
+    # if hackathon_not_started:
+        # return redirect(reverse('hackathon_onboard', args=(hackathon_event.slug,)))
 
     orgs = []
 
@@ -3773,6 +3774,7 @@ def hackathon(request, hackathon='', panel='prizes'):
         'hackathon': hackathon_event,
         'hackathon_obj': HackathonEventSerializer(hackathon_event).data,
         'is_registered': json.dumps(True if is_registered else False),
+        'prize_blocked': hackathon_not_started and is_registered,
         'user': request.user,
         'tags': view_tags,
         'activities': [],

From 1fc04f7652babb97f7bad671604826dc63f668c6 Mon Sep 17 00:00:00 2001
From: octavioamu <octavioamuchastegui@gmail.com>
Date: Wed, 15 Apr 2020 00:09:55 -0300
Subject: [PATCH 5/8] fix svg not showing and img ratios

---
 .../templates/dashboard/index-vue.html        | 38 +++++++++++--------
 1 file changed, 23 insertions(+), 15 deletions(-)

diff --git a/app/dashboard/templates/dashboard/index-vue.html b/app/dashboard/templates/dashboard/index-vue.html
index 4cbf612ab9b..2b2057ead98 100644
--- a/app/dashboard/templates/dashboard/index-vue.html
+++ b/app/dashboard/templates/dashboard/index-vue.html
@@ -118,9 +118,11 @@
           grid-template-columns: repeat(3, 1fr);
         }
       }
+
       .page-link-gc {
         color: #3e24fb;
       }
+
       .page-item.active .page-link-gc {
         background-color: #3e24fb;
         border-color: #3e24fb;
@@ -153,47 +155,53 @@
       .hackathon-title {
           font-size: 1.4rem;
       }
+
       .hackathon-countdown {
           font-size: 1rem;
       }
+
       .bounty_row {
         background-color: white;
         margin-bottom: 15px;
         border-radius: 4px;
       }
+
       .hack-logo-wrapper {
           position: absolute;
           max-width: 240px;
           top: -200px;
           left: -32%;
       }
+
       .townsquare_header {
         width: 100%;
         height: 100%;
         overflow: hidden;
       }
+
       .hackathon-logo {
-          height: 240px;
-          max-height: 240px;
-          width: 240px;
-          max-width: 240px;
-          background: {% firstof hackathon.background_color or '#090E60' %};
-          border-radius: 10px;
-          color: {% firstof hackathon.text_color or 'black' %};
-          display: flex;
-          flex-direction: column;
-          justify-content: center;
-          align-items: center;
+        height: 240px;
+        max-height: 240px;
+        width: 240px;
+        max-width: 240px;
+        background: {% firstof hackathon.background_color or '#090E60' %};
+        border-radius: 10px;
+        color: {% firstof hackathon.text_color or 'black' %};
+        display: flex;
+        flex-direction: column;
+        justify-content: center;
+        align-items: center;
       }
+
       .hackathon-logo img {
-          height: 185px;
+        height: 185px;
+        object-fit: contain;
       }
+
       .register {
         width: 100%;
       }
 
-
-
       .card-bg {
         background-color: #0C1A27;
         padding: 1.8em;
@@ -315,7 +323,7 @@
               <template v-slot:tabs-start>
                 <div class="hack-logo-wrapper d-none d-md-block">
                   <div class="mb-1 hackathon-logo">
-                    <b-img-lazy v-if="hackathonObj.logo_svg" class="d-none d-md-block mx-auto mb-1 mw-100" :src="hackathonObj.logo_svg.url" alt="Hackathon logo"></b-img-lazy>
+                    <b-img-lazy v-if="hackathonObj.logo_svg" class="d-none d-md-block mx-auto mb-1 mw-100" :src="hackathonObj.logo_svg" alt="Hackathon logo"></b-img-lazy>
                     <b-img-lazy v-else-if="hackathonObj.logo" class="d-none d-md-block mx-auto mb-1 mw-100" :src="hackathonObj.logo" alt="Hackathon logo"></b-img-lazy>
                     <small>{{ hackathon.start_date|date:"M j, Y" }} - {{ hackathon.end_date|date:"M j, Y" }}</small>
                   </div>

From d97ed3306ee44d43e6cfe797b4cdf03991a1c7e6 Mon Sep 17 00:00:00 2001
From: octavioamu <octavioamuchastegui@gmail.com>
Date: Wed, 15 Apr 2020 00:34:01 -0300
Subject: [PATCH 6/8] fix resgister js boolean

---
 app/dashboard/templates/dashboard/index-vue.html              | 2 +-
 .../templates/dashboard/sidebar_search_hackathon.html         | 4 +---
 app/dashboard/views.py                                        | 2 +-
 3 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/app/dashboard/templates/dashboard/index-vue.html b/app/dashboard/templates/dashboard/index-vue.html
index 2b2057ead98..f2688e68535 100644
--- a/app/dashboard/templates/dashboard/index-vue.html
+++ b/app/dashboard/templates/dashboard/index-vue.html
@@ -343,7 +343,7 @@
                     </div>
                   </div>
                   <div class="col-12 col-md-9 p-2 ml-sm-4">
-                    {% if not prize_blocked %}
+                    {% if not hackathon_not_started %}
                       <div class="px-2" id="bounties">
                         <div id="dashboard-title" class="hidden">
                           {% include 'shared/search_bar.html' %}
diff --git a/app/dashboard/templates/dashboard/sidebar_search_hackathon.html b/app/dashboard/templates/dashboard/sidebar_search_hackathon.html
index 1e37b5fd1f2..4c58d9cc45f 100644
--- a/app/dashboard/templates/dashboard/sidebar_search_hackathon.html
+++ b/app/dashboard/templates/dashboard/sidebar_search_hackathon.html
@@ -29,9 +29,7 @@
     <div class="col">
 
     {% if hackathon %}
-      {% if not is_registered %}
-        <a href="{% url 'hackathon_onboard' hackathon.slug %}" class="btn btn-gc-blue btn-block text-uppercase mb-4">Register</a>
-      {% endif %}
+      <a v-if="!is_registered" href="{% url 'hackathon_onboard' hackathon.slug %}" class="btn btn-gc-blue btn-block text-uppercase mb-4">Register</a>
       <div class="col-12 subheading left-ribbon">
         {% trans "Hackathon Sponsors" %}
       </div>
diff --git a/app/dashboard/views.py b/app/dashboard/views.py
index e5d88da06a0..1a3d98fbe4a 100644
--- a/app/dashboard/views.py
+++ b/app/dashboard/views.py
@@ -3774,7 +3774,7 @@ def hackathon(request, hackathon='', panel='prizes'):
         'hackathon': hackathon_event,
         'hackathon_obj': HackathonEventSerializer(hackathon_event).data,
         'is_registered': json.dumps(True if is_registered else False),
-        'prize_blocked': hackathon_not_started and is_registered,
+        'hackathon_not_started': hackathon_not_started,
         'user': request.user,
         'tags': view_tags,
         'activities': [],

From e3ed0adcfdf58ac46e11f6c598f7fc8a47da3991 Mon Sep 17 00:00:00 2001
From: octavioamu <octavioamuchastegui@gmail.com>
Date: Wed, 15 Apr 2020 00:58:22 -0300
Subject: [PATCH 7/8] fix conditional dates

---
 app/assets/v2/js/pages/dashboard-hackathon.js    | 3 +--
 app/dashboard/templates/dashboard/index-vue.html | 9 +++++++--
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/app/assets/v2/js/pages/dashboard-hackathon.js b/app/assets/v2/js/pages/dashboard-hackathon.js
index a897d39fce5..b741ba47a20 100644
--- a/app/assets/v2/js/pages/dashboard-hackathon.js
+++ b/app/assets/v2/js/pages/dashboard-hackathon.js
@@ -1017,8 +1017,7 @@
         hackathonObj: document.hackathonObj,
         hackathonSponsors: document.hackathonSponsors,
         hackathonProjects: [],
-        chatURL: document.chatURL,
-        timeuntil: document.timeuntil
+        chatURL: document.chatURL
       })
     });
   });
diff --git a/app/dashboard/templates/dashboard/index-vue.html b/app/dashboard/templates/dashboard/index-vue.html
index f2688e68535..2184b4a1a84 100644
--- a/app/dashboard/templates/dashboard/index-vue.html
+++ b/app/dashboard/templates/dashboard/index-vue.html
@@ -314,7 +314,13 @@
                 <p class="hackathon-title title font-weight-bold mb-0">[[ hackathonObj.name ]]</p>
               </div>
               <p class="mb-1">
-                  <small v-if="timeuntil >= '1 min'" class="hackathon-countdown text-uppercase">Ends in [[ timeuntil]] </small>
+                {% if hackathon.start_date|timesince <= "1 min" %}
+                  <small class="hackathon-countdown text-uppercase">Starts in {{hackathon.start_date | timeuntil}}</small>
+                {% elif hackathon.end_date|timeuntil >= "1 min" %}
+                  <small class="hackathon-countdown text-uppercase">Ends in {{hackathon.end_date|timeuntil}}</small>
+                {% else %}
+                  <small class="hackathon-countdown text-uppercase">Ended Hackathon</small>
+                {% endif %}
               </p>
             </div>
           </div>
@@ -964,7 +970,6 @@ <h6 class="font-weight-bold mb-3">Invite [[numUsers]] Users to the Bounty</h6>
       document.hackathonObj = JSON.parse(document.getElementById('hackathon-object').textContent);
       document.activePanel = parseInt({{panel | safe}});
       document.chatURL = "{{ chat_url | safe}}";
-      document.timeuntil = "{{ hackathon.end_date | timeuntil }}";
       if(location.hostname === 'gitcoin.co') $('#network-filter').hide();
     </script>
     <script src='{% static "v2/js/pages/dashboard-hackathon.js" %}'></script>

From 32bd60fb36eb6195b748b4ac5309545bb042ab2b Mon Sep 17 00:00:00 2001
From: octavioamu <octavioamuchastegui@gmail.com>
Date: Wed, 15 Apr 2020 01:03:33 -0300
Subject: [PATCH 8/8] fix spell

---
 app/dashboard/templates/dashboard/index-vue.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/dashboard/templates/dashboard/index-vue.html b/app/dashboard/templates/dashboard/index-vue.html
index 2184b4a1a84..021cc3022e9 100644
--- a/app/dashboard/templates/dashboard/index-vue.html
+++ b/app/dashboard/templates/dashboard/index-vue.html
@@ -319,7 +319,7 @@
                 {% elif hackathon.end_date|timeuntil >= "1 min" %}
                   <small class="hackathon-countdown text-uppercase">Ends in {{hackathon.end_date|timeuntil}}</small>
                 {% else %}
-                  <small class="hackathon-countdown text-uppercase">Ended Hackathon</small>
+                  <small class="hackathon-countdown text-uppercase">Hackathon Over</small>
                 {% endif %}
               </p>
             </div>