gitcoinco · thelostone-mc · Mar 3, 2021 · Feb 4, 2021 · Feb 5, 2021 · Feb 5, 2021
@@ -91,6 +91,7 @@
     'django.contrib.messages',
     'collectfast',  # Collectfast | static file collector
     'django.contrib.staticfiles',
+    'livereload',
     'cacheops',
     'storages',
     'social_django',

@@ -30,133 +30,135 @@
   </head>
 
   <body id="{{ explore }}" class="interior {{active}} g-font-muli">
-    {% include 'shared/tag_manager_2.html' %}
-    <div class="container-fluid header dash">
-      {% include 'shared/top_nav.html' with class='d-md-flex' %}
-      {% include 'home/nav.html' %}
-    </div>
-    {% block content %}
-    <h2>Search</h2>
-
-    <form method="get" action="">
-      <table>
-        {{ form.as_table }}
-        <tr>
-          <td>&nbsp;</td>
-          <td>
-            <input type="submit" value="Search">
-          </td>
-        </tr>
-      </table>
-
-      {% if query %}
-        <h3>Results</h3>
-
-        {% for result in page.object_list %}
-          <p>
-            <a href="{{ result.object.get_absolute_url }}">{{ result.object.title }}</a>
-          </p>
-          {% empty %}
-          <p>No results found.</p>
-        {% endfor %}
-
-        {% if page.has_previous or page.has_next %}
-          <div>
-            {% if page.has_previous %}<a href="?q={{ query }}&amp;page={{ page.previous_page_number }}">{% endif %}&laquo; Previous{% if page.has_previous %}</a>{% endif %}
-            |
-            {% if page.has_next %}<a href="?q={{ query }}&amp;page={{ page.next_page_number }}">{% endif %}Next &raquo;{% if page.has_next %}</a>{% endif %}
-          </div>
-        {% endif %}
-      {% else %}
-        {# Show some example queries to run, maybe query syntax, something else? #}
-      {% endif %}
-    </form>
-    {% endblock %}
-    <div id="gc-users-directory" v-cloak>
-
-      <section>
-        <h1 class='is-title'>Hacky User Directory</h1>
-
-        <hr class='is-line' />
-
-        <div class="filters" style="width : 90%; margin : 0 auto;">
-          <tag-filter :for="'searchbox'"></tag-filter>
-          <tag-filter :for="'searchdatalist'">
-            <template slot-scope="{ data }">
-              [[ data._source.keywords ]]
-            </template>
-          </tag-filter>
-          <tag-filter :for="'nlf'">
-            <template slot-scope="{ data }">
-              Number of Hacks Joined: [[ data._source.keywords ]]
-            </template>
-          </tag-filter>
-        </div>
-
-        <div class="is-columns">
-          <div class="is-column is-one-fifth">
+    <div class="content__main min-vh-100 d-md-flex flex-column">
+      {% include 'shared/tag_manager_2.html' %}
+      <div class="container-fluid header dash">
+        {% include 'shared/top_nav.html' with class='d-md-flex' %}
+        {% include 'home/nav.html' %}
+      </div>
+      {% block content %}
+      <h2>Search</h2>
+
+      <form method="get" action="">
+        <table>
+          {{ form.as_table }}
+          <tr>
+            <td>&nbsp;</td>
+            <td>
+              <input type="submit" value="Search">
+            </td>
+          </tr>
+        </table>
+
+        {% if query %}
+          <h3>Results</h3>
+
+          {% for result in page.object_list %}
+            <p>
+              <a href="{{ result.object.get_absolute_url }}">{{ result.object.title }}</a>
+            </p>
+            {% empty %}
+            <p>No results found.</p>
+          {% endfor %}
+
+          {% if page.has_previous or page.has_next %}
             <div>
-              <numeric-list-filter :id="'nlf'" :field="'num_hacks_joined'">
-                <template slot="header">
-                  <h3 class="is-nlf-title">Number of Hacks Joined : </h3>
-                </template>
-              </numeric-list-filter>
+              {% if page.has_previous %}<a href="?q={{ query }}&amp;page={{ page.previous_page_number }}">{% endif %}&laquo; Previous{% if page.has_previous %}</a>{% endif %}
+              |
+              {% if page.has_next %}<a href="?q={{ query }}&amp;page={{ page.next_page_number }}">{% endif %}Next &raquo;{% if page.has_next %}</a>{% endif %}
             </div>
+          {% endif %}
+        {% else %}
+          {# Show some example queries to run, maybe query syntax, something else? #}
+        {% endif %}
+      </form>
+      {% endblock %}
+      <div id="gc-users-directory" v-cloak>
+
+        <section>
+          <h1 class='is-title'>Hacky User Directory</h1>
+
+          <hr class='is-line' />
+
+          <div class="filters" style="width : 90%; margin : 0 auto;">
+            <tag-filter :for="'searchbox'"></tag-filter>
+            <tag-filter :for="'searchdatalist'">
+              <template slot-scope="{ data }">
+                [[ data._source.keywords ]]
+              </template>
+            </tag-filter>
+            <tag-filter :for="'nlf'">
+              <template slot-scope="{ data }">
+                Number of Hacks Joined: [[ data._source.keywords ]]
+              </template>
+            </tag-filter>
           </div>
-          <div class="is-column">
-            <div>
-              <searchbox :id="'searchbox'" :autofocus="true" :realtime="true" :timeout="200" :field="['keywords', 'handle', 'persona']" :placeholder="'Search by keyword'"></searchbox>
-              <search-datalist :id="'searchdatalist'" :realtime="true" :field="'keywords'" :suggestion="['keywords']">
-                <template slot="items" slot-scope="{ item, value }">
-                  [[ value ]] [[ item._source.keywords ]]
-                </template>
-
-                <template slot="nosuggestion" slot-scope="{ value }">
-                  Sorry, "[[ value ]]" doesn't exist... :(
-                </template>
-
-                <template slot="suggestions" slot-scope="{ suggestion }">
-                  <span v-html="suggestion.highlight.first_name ? suggestion.highlight.first_name[0] : suggestion._source.first_name"></span>
-                  <span v-html="suggestion.highlight.last_name ? suggestion.highlight.last_name[0] : suggestion._source.last_name"></span>
-                  <span v-html="suggestion.highlight.handle ? suggestion.highlight.handle[0] : suggestion._source.handle"></span>
-                  <span v-html="suggestion.highlight.persona ? suggestion.highlight.persona[0] : suggestion._source.persona"></span>
-                </template>
-              </search-datalist>
-
-              <div style="margin: 20px auto;width: 90%">
-                <search-button></search-button>
-                <reset-button :emptyHits="false"></reset-button>
+
+          <div class="is-columns">
+            <div class="is-column is-one-fifth">
+              <div>
+                <numeric-list-filter :id="'nlf'" :field="'num_hacks_joined'">
+                  <template slot="header">
+                    <h3 class="is-nlf-title">Number of Hacks Joined : </h3>
+                  </template>
+                </numeric-list-filter>
+              </div>
+            </div>
+            <div class="is-column">
+              <div>
+                <searchbox :id="'searchbox'" :autofocus="true" :realtime="true" :timeout="200" :field="['keywords', 'handle', 'persona']" :placeholder="'Search by keyword'"></searchbox>
+                <search-datalist :id="'searchdatalist'" :realtime="true" :field="'keywords'" :suggestion="['keywords']">
+                  <template slot="items" slot-scope="{ item, value }">
+                    [[ value ]] [[ item._source.keywords ]]
+                  </template>
+
+                  <template slot="nosuggestion" slot-scope="{ value }">
+                    Sorry, "[[ value ]]" doesn't exist... :(
+                  </template>
+
+                  <template slot="suggestions" slot-scope="{ suggestion }">
+                    <span v-html="suggestion.highlight.first_name ? suggestion.highlight.first_name[0] : suggestion._source.first_name"></span>
+                    <span v-html="suggestion.highlight.last_name ? suggestion.highlight.last_name[0] : suggestion._source.last_name"></span>
+                    <span v-html="suggestion.highlight.handle ? suggestion.highlight.handle[0] : suggestion._source.handle"></span>
+                    <span v-html="suggestion.highlight.persona ? suggestion.highlight.persona[0] : suggestion._source.persona"></span>
+                  </template>
+                </search-datalist>
+
+                <div style="margin: 20px auto;width: 90%">
+                  <search-button></search-button>
+                  <reset-button :emptyHits="false"></reset-button>
+                </div>
+                <hits>
+                  <template slot="hits" slot-scope="{ hits }">
+                    <div class="is-score is-hits">
+                      <strong v-if="hits.score === 0">No result found</strong>
+                      <strong v-else-if="hits.score === 1">1 result found</strong>
+                      <strong v-else-if="hits.score > 1">[[ hits.score ]] results found</strong>
+                    </div>
+                    <div v-for="item in hits.items" :item="item">
+                      <div><strong>Identity (firstname, lastname) :</strong> ([[ item._source.first_name ]] [[ item._source.last_name ]] )</div>
+                    </div>
+                  </template>
+                </hits>
+
+                <paginate :previousText="'&#x2B9C; Previous page'" :nextText="'Next page &#x2B9E;'" :size="10"></paginate>
               </div>
-              <hits>
-                <template slot="hits" slot-scope="{ hits }">
-                  <div class="is-score is-hits">
-                    <strong v-if="hits.score === 0">No result found</strong>
-                    <strong v-else-if="hits.score === 1">1 result found</strong>
-                    <strong v-else-if="hits.score > 1">[[ hits.score ]] results found</strong>
-                  </div>
-                  <div v-for="item in hits.items" :item="item">
-                    <div><strong>Identity (firstname, lastname) :</strong> ([[ item._source.first_name ]] [[ item._source.last_name ]] )</div>
-                  </div>
-                </template>
-              </hits>
-
-              <paginate :previousText="'&#x2B9C; Previous page'" :nextText="'Next page &#x2B9E;'" :size="10"></paginate>
             </div>
           </div>
-        </div>
-      </section>
+        </section>
+      </div>
+
+      <script type="text/x-template" id="select2-template">
+        <select>
+          <slot></slot>
+        </select>
+      </script>
+
+      {% csrf_token %}
+      {% include 'shared/analytics.html' %}
+      {% include 'shared/footer_scripts.html' with slim=1 %}
+      {% include 'shared/footer.html' %}
     </div>
-
-    <script type="text/x-template" id="select2-template">
-      <select>
-        <slot></slot>
-      </select>
-    </script>
-
-    {% csrf_token %}
-    {% include 'shared/analytics.html' %}
-    {% include 'shared/footer_scripts.html' with slim=1 %}
-    {% include 'shared/footer.html' %}
     <script src="https://cdn.jsdelivr.net/npm/[email protected]/innersearch.min.js"></script>
 
 

@@ -52,26 +52,26 @@ <h5 class="font-subheader font-weight-semibold">
 
             <div class="mt-3 hackathon-actions">
               {% if event.end_date|timesince_fromisoformat <= "1 min" %}
-                <a href="{% url 'hackathon_onboard' event.slug %}" class="btn {% if force_color %}no-pink{% endif %} btn-gc-blue font-caption font-weight-semibold px-3 mb-2">
+                <a href="{% url 'hackathon_onboard' event.slug %}" class="btn {% if force_color %}no-pink{% endif %} btn-primary font-caption px-3 mb-2">
                   <i class="fas fa-user-plus mr-2 d-none d-sm-inline"></i>
                   Join
                 </a>
               {% endif %}
               {% if event.display_showcase %}
-              <a href="{% url 'hackathon_showcase_proxy' event.slug %}" class="btn {% if force_color %}no-pink{% endif %} btn-gc-blue font-caption font-weight-semibold px-3 mb-2">
+              <a href="{% url 'hackathon_showcase_proxy' event.slug %}" class="btn {% if force_color %}no-pink{% endif %} btn-primary font-caption px-3 mb-2">
                 <i class="fas fa-star d-none d-sm-inline" style="font-size:6.5px;position:relative;top:0.2rem;left:0.2rem;"></i>
                 <i class="fas fa-star mr-1 d-none d-sm-inline"></i>
                 Showcase
               </a>
               {% endif %}
               {% if event.start_date|timesince_fromisoformat >= "1 min" and event.end_date|timesince_fromisoformat <= "1 min"%}
-                <a href="{% url 'hackathon_prizes' event.slug %}" class="btn {% if force_color %}no-pink{% endif %} button--secondary font-caption font-weight-semibold px-3 mb-2">
+                <a href="{% url 'hackathon_prizes' event.slug %}" class="btn {% if force_color %}no-pink{% endif %} btn-outline-primary font-caption px-3 mb-2">
                   <i class="fas fa-trophy mr-2 d-none d-sm-inline"></i>
                   Prizes
                 </a>
               {% endif %}
               {% if event.show_results %}
-                <a href="{% url 'hackathon_projects' event.slug %}" class="btn {% if force_color %}no-pink{% endif %} button--secondary font-caption font-weight-semibold px-3 mb-2">
+                <a href="{% url 'hackathon_projects' event.slug %}" class="btn {% if force_color %}no-pink{% endif %} btn-outline-primary font-caption px-3 mb-2">
                   <i class="fas fa-dharmachakra mr-2 d-none d-sm-inline"></i>
                   Projects
                 </a>

@@ -27,4 +27,5 @@
     from raven.contrib.django.raven_compat.middleware.wsgi import Sentry
     application = Sentry(get_wsgi_application())
 else:
-    application = get_wsgi_application()
+    from dj_static import Cling
+    application = Cling(get_wsgi_application())
@@ -553,7 +553,7 @@ body #main a.no-pink:hover {
   color: var(--gc-blue-hover);
 }
 
-body #main a.no-pink.btn-gc-blue {
+body #main a.no-pink.btn-primary {
   color: #ffffff;
 }