gitcoinco · thelostone-mc · Feb 13, 2021 · Feb 4, 2021 · Feb 5, 2021 · Feb 5, 2021
@@ -4,3 +4,7 @@ app/assets/v2/css/bootstrap-vue.min.css
 app/assets/v2/js/lib/tweenlite.js
 app/assets/v2/js/abi.js
 app/assets/v2/css/lib/*
+
+app/assets/v2/scss/jquery.select2.min.scss
+app/assets/v2/scss/vue-innersearch.scss
+app/assets/v2/scss/lib/*
@@ -1,6 +1,7 @@
 {
   "extends": "stylelint-config-recommended",
   "rules": {
+    "no-descending-specificity": null,
     "at-rule-no-unknown": [
       true, {
         "ignoreAtRules": [
@@ -25,7 +26,11 @@
       "vh",
       "pt",
       "vmin",
-      "fr"
+      "fr",
+      "turn"
     ]
-  }
+  },
+  "plugins": [
+    "stylelint-scss"
+  ],
 }
@@ -47,6 +47,7 @@ jobs:
         - pip install -r requirements/test.txt
         - npm run eslint
         - npm run stylelint
+        - (cd app; python3 ./manage.py collectstatic --noinput --disable-collectfast)
         - pytest -p no:ethereum -p no:warnings
         # Generate Markdown documentation and static docs page.
         - pydocmd build

@@ -208,8 +208,10 @@
 ]
 # number of demicals allowed in sass numbers
 LIBSASS_PRECISION = 8
-# minify sass output in production
+# minify sass output in production (offline)
 if ENV not in ['local', 'test', 'staging', 'preview']:
+    # compress offline (use './manage.py compress' to build manifest.json)
+    COMPRESS_OFFLINE = True
     # drop line comments
     LIBSASS_SOURCE_COMMENTS = False
     # minification of sass output

@@ -1,31 +1,32 @@
 {% comment %}
-    Copyright (C) 2020 Gitcoin Core
+  Copyright (C) 2020 Gitcoin Core
 
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU Affero General Public License as published
-    by the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
+  This program is free software: you can redistribute it and/or modify
+  it under the terms of the GNU Affero General Public License as published
+  by the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
 
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-    GNU Affero General Public License for more details.
-
-    You should have received a copy of the GNU Affero General Public License
-    along with this program. If not, see <http://www.gnu.org/licenses/>.
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+  GNU Affero General Public License for more details.
 
+  You should have received a copy of the GNU Affero General Public License
+  along with this program. If not, see <http://www.gnu.org/licenses/>. 
 {% endcomment %}
-{% load i18n static email_obfuscator add_url_schema avatar_tags %}
+{% load i18n static email_obfuscator add_url_schema avatar_tags compress %} 
 <!DOCTYPE html>
-<html lang="en">
+  <html lang="en">
 
   <head>
     {% include 'shared/head.html' %}
     {% include 'shared/cards.html' %}
-    <link rel="stylesheet" href={% static "v2/css/users.css" %} />
-    <link rel="stylesheet" href={% static "v2/css/tag.css" %} />
-    <link rel="stylesheet" href={% static "v2/css/rating.css" %} />
-    <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/[email protected]/default-innersearch-theme.min.css">
+    {% compress css file search %}
+      <link rel="stylesheet" type="text/x-scss" href={% static "v2/scss/users.scss" %} />
+      <link rel="stylesheet" type="text/x-scss" href={% static "v2/scss/tag.scss" %} />
+      <link rel="stylesheet" type="text/x-scss" href={% static "v2/scss/rating.scss" %} />
+      <link rel="stylesheet" type="text/x-scss" href={% static "v2/scss/vue-innersearch.scss" %}>
+    {% endcompress %}
   </head>
 
   <body id="{{ explore }}" class="interior {{active}} g-font-muli">
@@ -38,39 +39,39 @@
     <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? #}
+      <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 %}
+    {% endblock %}
     <div id="gc-users-directory" v-cloak>
 
       <section>
@@ -79,71 +80,71 @@ <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 }">
+          <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>
+          </tag-filter>
         </div>
 
         <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 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>
-            <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>
-             </div>
+          </div>
         </div>
-    </section>
+      </section>
     </div>
 
     <script type="text/x-template" id="select2-template">
@@ -154,7 +155,7 @@ <h3 class="is-nlf-title">Number of Hacks Joined : </h3>
 
     {% csrf_token %}
     {% include 'shared/analytics.html' %}
-    {% include 'shared/footer_scripts.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>
 

@@ -14,12 +14,14 @@
   You should have received a copy of the GNU Affero General Public License
   along with this program. If not, see <http://www.gnu.org/licenses/>.
 {% endcomment %}
-{% load static %}
-<script src="{% static "v2/js/tokens.js" %}"></script>
+{% load static compress %}
+
 <script src="/dynamic/js/tokens_dynamic.js"></script>
 <script src="{% static "v2/js/lib/ipfs-api.js" %}"></script>
+{% compress js file tip_dependancies %}
+<script src="{% static "v2/js/tokens.js" %}"></script>
 <script src="{% static "v2/js/ipfs.js" %}"></script>
 <script src="{% static "v2/js/lib/secrets.min.js" %}"></script>
 <script src="{% static "v2/js/ethereumjs-accounts.js" %}"></script>
 <script src="{% static "onepager/js/send.js" %}"></script>
-<script src="{% static "v2/js/truncate-hash.js" %}"></script>
+{% endcompress %}
@@ -1,20 +1,20 @@
 
 .floating{
-	animation: floating 3s ease-in-out infinite;
+  animation: floating 3s ease-in-out infinite;
 }
 
 .floating2{
-	animation: floating2 3s ease-in-out infinite;
+  animation: floating2 3s ease-in-out infinite;
 }
 
 @keyframes floating { 
-    0% { transform: translate(0,  0px); } 
-    50%  { transform: translate(0, 15px); } 
-    100%   { transform: translate(0, 0px); }     
+  0% { transform: translate(0,  0px); } 
+  50%  { transform: translate(0, 15px); } 
+  100%   { transform: translate(0, 0px); }     
 } 
 
 @keyframes floating2 { 
-    0% { transform: translate(0,  15px); } 
-    50%  { transform: translate(0, 0px); } 
-    100%   { transform: translate(0, 15px); }     
+  0% { transform: translate(0,  15px); } 
+  50%  { transform: translate(0, 0px); } 
+  100%   { transform: translate(0, 15px); }     
 } 
@@ -5,27 +5,27 @@ $phone:  "(max-width: 688px)";
 
 
 @media #{$desktop} {
-	:root{
-		--device: "desktop";
-	}
+  :root{
+    --device: "desktop";
+  }
 }
 
 @media #{$laptop} {
-	:root{
-		--device: "laptop";
-	}
+  :root{
+    --device: "laptop";
+  }
 }
 
 @media #{$tablet} { 
-	:root{
-		--device: "tablet";
-	}
+  :root{
+    --device: "tablet";
+  }
 }
 
 @media #{$phone} { 
-	:root{
-		--device: "phone";
-	}
+  :root{
+    --device: "phone";
+  }
 }