Merge pull request #4375 from thelostone-mc/refactor

restructure: move all lib js files into js/lib/*

.eslintignore

@@ -1,12 +1,12 @@
 *.min.js
 
 app/assets/v2/js/event_ethdenver2019/blockies.js
-app/assets/v2/js/ipfs-api.js
-app/assets/v2/js/jquery*.js
-app/assets/v2/js/jsrender.js
-app/assets/v2/js/showdown.js
-app/assets/v2/js/tooltip.js
-app/assets/v2/js/tweenlite.js
+app/assets/v2/js/lib/ipfs-api.js
+app/assets/v2/js/lib/jquery*.js
+app/assets/v2/js/lib/jsrender.js
+app/assets/v2/js/lib/showdown.js
+app/assets/v2/js/lib/tooltip.js
+app/assets/v2/js/lib/tweenlite.js
 app/assets/v2/js/abi.js
 
 app/assets/onepager/js/confetti.js

.stylelintignore

@@ -1,4 +1,4 @@
 app/assets/v2/css/jquery.select2.min.css
 app/assets/v2/css/bootstrap.min.css
-app/assets/v2/js/tweenlite.js
+app/assets/v2/js/lib/tweenlite.js
 app/assets/v2/js/abi.js

Makefile

@@ -15,7 +15,7 @@ autotranslate: ## Automatically translate all untranslated entries for all LOCAL
 	@echo "Starting makemessages..."
 	@docker-compose exec web python3 app/manage.py makemessages -a -d django -i node_modules -i static -i ipfs
 	@echo "Starting JS makemessages..."
-	@docker-compose exec web python3 app/manage.py makemessages -a -d djangojs -i node_modules -i static -i assets/v2/js/ipfs-api.js
+	@docker-compose exec web python3 app/manage.py makemessages -a -d djangojs -i node_modules -i static -i assets/v2/js/lib/ipfs-api.js
 	@echo "Starting autotranslation of messages..."
 	@docker-compose exec web python3 app/manage.py translate_messages -u
 	# TODO: Add check for messed up python var strings.

app/dashboard/templates/bounty/details.html

@@ -440,13 +440,13 @@ <h5 class="bounty-heading">{% trans "Funder" %}</h5>
   </script>
 
   <!-- jQuery -->
-  <script src="{% static "v2/js/showdown.js" %}"></script>
+  <script src="{% static "v2/js/lib/showdown.js" %}"></script>
   <script src="{% static "v2/js/abi.js" %}"></script>
   <script src="/dynamic/js/tokens_dynamic.js"></script>
   <script src="{% static "v2/js/tokens.js" %}"></script>
   <script src="{% static "v2/js/amounts.js" %}"></script>
-  <script src="{% static "v2/js/popper.min.js" %}"></script>
-  <script src="{% static "v2/js/bootstrap.min.js" %}" crossorigin="anonymous"></script>
+  <script src="{% static "v2/js/lib/popper.min.js" %}"></script>
+  <script src="{% static "v2/js/lib/bootstrap.min.js" %}" crossorigin="anonymous"></script>
   <script src="{% static "v2/js/clipboard.js" %}"></script>
   <script>
     let bootstrapTooltip = $.fn.tooltip.noConflict()
@@ -465,7 +465,7 @@ <h5 class="bounty-heading">{% trans "Funder" %}</h5>
   <script src="{% static "v2/js/pages/bounty_share.js" %}"></script>
   <script src="{% static "v2/js/pages/bounty_details.js" %}"></script>
   <script src="{% static "v2/js/user_popover.js" %}"></script>
-  <script src="{% static "v2/js/ipfs-api.js" %}"></script>
+  <script src="{% static "v2/js/lib/ipfs-api.js" %}"></script>
   <script src="{% static "v2/js/ipfs.js" %}"></script>
   <script src="{% static "v2/js/user-search.js" %}"></script>
   <script src="{% static "v2/js/waiting_room_entertainment.js" %}"></script>

app/dashboard/templates/bounty/fulfill.html

@@ -102,8 +102,8 @@ <h1 class="text-center title">{% trans "Submit Work" %}</h1>
   </body>
 
   <!-- jQuery -->
-  <script src="{% static "v2/js/popper.min.js" %}"></script>
-  <script src="{% static "v2/js/bootstrap.min.js" %}" crossorigin="anonymous"></script>
+  <script src="{% static "v2/js/lib/popper.min.js" %}"></script>
+  <script src="{% static "v2/js/lib/bootstrap.min.js" %}" crossorigin="anonymous"></script>
   <script>
     var bootstrapTooltip = $.fn.tooltip.noConflict()
     var bootstrapModal = $.fn.modal.noConflict()
@@ -120,7 +120,7 @@ <h1 class="text-center title">{% trans "Submit Work" %}</h1>
   <script src="{% static "v2/js/tokens.js" %}"></script>
   <script src="{% static "v2/js/pages/shared_bounty_mutation_estimate_gas.js" %}"></script>
   <script src="{% static "v2/js/pages/fulfill_bounty.js" %}"></script>
-  <script src="{% static "v2/js/ipfs-api.js" %}"></script>
+  <script src="{% static "v2/js/lib/ipfs-api.js" %}"></script>
   <script src="{% static "v2/js/ipfs.js" %}"></script>
 
 </html>

app/dashboard/templates/bounty/increase.html

@@ -174,11 +174,11 @@ <h5 class="font-title-lg mb-0">{% trans "Total"%} </h5>
   </script>
 
   <script src="{% static "v2/js/pages/wallet_estimate.js" %}"></script>
-  <script src="{% static "v2/js/ipfs-api.js" %}"></script>
+  <script src="{% static "v2/js/lib/ipfs-api.js" %}"></script>
   <script src="{% static "v2/js/ipfs.js" %}"></script>
-  <script src="{% static "v2/js/secrets.min.js" %}"></script>
+  <script src="{% static "v2/js/lib/secrets.min.js" %}"></script>
   <script src="{% static "v2/js/ethereumjs-accounts.js" %}"></script>
-  <script src="{% static "v2/js/ipfs-api.js" %}"></script>
+  <script src="{% static "v2/js/lib/ipfs-api.js" %}"></script>
   <script src="{% static "v2/js/ipfs.js" %}"></script>
   <script src="{% static "v2/js/amounts.js" %}"></script>
   <script src="{% static "v2/js/abi.js" %}"></script>

app/dashboard/templates/bounty/new.html

@@ -321,7 +321,7 @@ <h5 class="font-title-lg mb-0">{% trans "Total"%} </h5>
 </script>
 
 <script src="{% static "v2/js/pages/wallet_estimate.js" %}"></script>
-<script src="{% static "v2/js/ipfs-api.js" %}"></script>
+<script src="{% static "v2/js/lib/ipfs-api.js" %}"></script>
 <script src="{% static "v2/js/ipfs.js" %}"></script>
 <script src="{% static "v2/js/amounts.js" %}"></script>
 <script src="{% static "v2/js/abi.js" %}"></script>

app/dashboard/templates/bulk_payout_bounty.html

@@ -203,8 +203,8 @@ <h5>{% trans 'Payout Preview' %}</h5>
   </body>
 
   <!-- jQuery -->
-  <script src="{% static "v2/js/popper.min.js" %}"></script>
-  <script src="{% static "v2/js/bootstrap.min.js" %}" crossorigin="anonymous"></script>
+  <script src="{% static "v2/js/lib/popper.min.js" %}"></script>
+  <script src="{% static "v2/js/lib/bootstrap.min.js" %}" crossorigin="anonymous"></script>
   <script>
     var bootstrapTooltip = $.fn.tooltip.noConflict()
     var bootstrapModal = $.fn.modal.noConflict()
@@ -220,9 +220,9 @@ <h5>{% trans 'Payout Preview' %}</h5>
   <script src="{% static "v2/js/pages/shared_bounty_mutation_estimate_gas.js" %}"></script>
   <script src="{% static "v2/js/pages/bulk_payout.js" %}"></script>
   <script src="/dynamic/js/tokens_dynamic.js"></script>
-  <script src="{% static "v2/js/ipfs-api.js" %}"></script>
+  <script src="{% static "v2/js/lib/ipfs-api.js" %}"></script>
   <script src="{% static "v2/js/ipfs.js" %}"></script>
-  <script src="{% static "v2/js/secrets.min.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/tooltip_hover.js" %}"></script>

app/dashboard/templates/dashboard/index.html

@@ -107,8 +107,8 @@ <h3>{% trans "No results found." %}</h3>
     {% include 'shared/footer_scripts.html' %}
     {% include 'shared/footer.html' %}
     {% include 'shared/messages.html' %}
-    <script src="{% static "v2/js/popper.min.js" %}"></script>
-    <script src="{% static "v2/js/bootstrap.min.js" %}" crossorigin="anonymous"></script>
+    <script src="{% static "v2/js/lib/popper.min.js" %}"></script>
+    <script src="{% static "v2/js/lib/bootstrap.min.js" %}" crossorigin="anonymous"></script>
     <script>
       let bootstrapTooltip = $.fn.tooltip.noConflict()
       $.fn.runTooltip = bootstrapTooltip

app/dashboard/templates/dashboard/users.html

@@ -253,8 +253,8 @@ <h6 class="font-weight-bold mb-3">Invite User to Bounty</h6>
     {% include 'shared/footer_scripts.html' %}
     {% include 'shared/footer.html' %}
     {% include 'shared/messages.html' %}
-    <script src="{% static "v2/js/popper.min.js" %}"></script>
-    <script src="{% static "v2/js/bootstrap.min.js" %}"></script>
+    <script src="{% static "v2/js/lib/popper.min.js" %}"></script>
+    <script src="{% static "v2/js/lib/bootstrap.min.js" %}"></script>
     <script>
       let bootstrapTooltip = $.fn.tooltip.noConflict()
       $.fn.runTooltip = bootstrapTooltip;

app/dashboard/templates/ens/base.html

@@ -24,7 +24,7 @@
     <link rel="stylesheet" href="{% static "v2/css/jquery.select2.min.css" %}">
     <link rel="stylesheet" href="{% static "cookielaw/css/cookielaw.css" %}">
 
-    <script src="{% static "v2/js/jquery.js" %}"></script>
+    <script src="{% static "v2/js/lib/jquery.js" %}"></script>
     <script src="{% static "v2/js/metamask-approval.js" %}"></script>
     <script src="{% static "v2/js/work_with_gitcoin.js" %}"></script>
     <!--[if lte IE 9]><link rel="stylesheet" href="{% static "onepager/css/ie9.css" %}"><![endif]-->
@@ -70,7 +70,7 @@
     {% block 'scripts' %}
     {% endblock %}
     {% include 'shared/twitter.html'  %}
-    <script src="{% static "v2/js/jquery.select2.min.js" %}"></script>
+    <script src="{% static "v2/js/lib/jquery.select2.min.js" %}"></script>
     <script src="{% static "cookielaw/js/cl.js" %}"></script>
   </body>
 </html>

app/dashboard/templates/ftux/avatar.html

@@ -167,8 +167,8 @@ <h3 id="section-title">
 </div>
 
 
-<script src="{% static "v2/js/jquery.js" %}"></script>
-<script src="{% static "v2/js/bootstrap.min.js" %}" crossorigin="anonymous"></script>
+<script src="{% static "v2/js/lib/jquery.js" %}"></script>
+<script src="{% static "v2/js/lib/bootstrap.min.js" %}" crossorigin="anonymous"></script>
 <script>
   var profileId = '{{ profile_id }}';
   var options = {

app/dashboard/templates/onepager/receive.html

@@ -18,8 +18,8 @@
 {% load i18n static %}
 {% block 'scripts' %}
 <script src="{% static "v2/js/abi.js" %}"></script>
-<script src="{% static "v2/js/secrets.min.js" %}"></script>
-<script src="{% static "v2/js/ipfs-api.js" %}"></script>
+<script src="{% static "v2/js/lib/secrets.min.js" %}"></script>
+<script src="{% static "v2/js/lib/ipfs-api.js" %}"></script>
 <script src="{% static "v2/js/ipfs.js" %}"></script>
 <script src="{% static "onepager/js/receive.js" %}"></script>
 <script src="{% static "onepager/js/confetti.js" %}"></script>

app/dashboard/templates/onepager/send2.html

@@ -18,12 +18,12 @@
 {% load i18n static %}
 {% block 'scripts' %}
   {% include 'shared/current_profile.html' %}
-  <script src="{% static "v2/js/ipfs-api.js" %}"></script>
+  <script src="{% static "v2/js/lib/ipfs-api.js" %}"></script>
   <script src="{% static "v2/js/ipfs.js" %}"></script>
   <script src="{% static "v2/js/tokens.js" %}"></script>
   <script src="{% static "v2/js/abi.js" %}"></script>
   <script src="{% static "v2/js/amounts.js" %}"></script>
-  <script src="{% static "v2/js/secrets.min.js" %}"></script>
+  <script src="{% static "v2/js/lib/secrets.min.js" %}"></script>
   <script src="{% static "v2/js/ethereumjs-accounts.js" %}"></script>
   <script src="/dynamic/js/tokens_dynamic.js"></script>
   <script src="{% static "onepager/js/send.js" %}"></script>

app/dashboard/templates/payout_bounty.html

@@ -95,9 +95,9 @@ <h5>{% trans "Advanced Payout." %}</h5>
   </body>
 
   <!-- jQuery -->
-  <script src="{% static "v2/js/ipfs-api.js" %}"></script>
+  <script src="{% static "v2/js/lib/ipfs-api.js" %}"></script>
   <script src="{% static "v2/js/ipfs.js" %}"></script>
-  <script src="{% static "v2/js/secrets.min.js" %}"></script>
+  <script src="{% static "v2/js/lib/secrets.min.js" %}"></script>
   <script src="{% static "v2/js/ethereumjs-accounts.js" %}"></script>
   <script src="{% static "v2/js/abi.js" %}"></script>
   <script src="/dynamic/js/tokens_dynamic.js"></script>

app/dashboard/templates/process_bounty.html

@@ -146,13 +146,13 @@ <h3 class="font-bigger-1 mb-0">Suggested Kudos</h3>
   </script>
 
   <!-- jQuery -->
-  <script src="{% static "v2/js/ipfs-api.js" %}"></script>
+  <script src="{% static "v2/js/lib/ipfs-api.js" %}"></script>
   <script src="{% static "v2/js/ipfs.js" %}"></script>
-  <script src="{% static "v2/js/secrets.min.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/popper.min.js" %}"></script>
-  <script src="{% static "v2/js/bootstrap.min.js" %}" crossorigin="anonymous"></script>
+  <script src="{% static "v2/js/lib/popper.min.js" %}"></script>
+  <script src="{% static "v2/js/lib/bootstrap.min.js" %}" crossorigin="anonymous"></script>
   <script>
     var bootstrapTooltip = $.fn.tooltip.noConflict()
     var bootstrapModal = $.fn.modal.noConflict()

app/dashboard/templates/profiles/profile.html

@@ -297,8 +297,8 @@ <h1 class="profile-header__handle">
     <script src="{% static "v2/js/abi.js" %}"></script>
     <script src="/dynamic/js/tokens_dynamic.js"></script>
     <script src="{% static "v2/js/tokens.js" %}"></script>
-    <script src="{% static "v2/js/popper.min.js" %}"></script>
-    <script src="{% static "v2/js/bootstrap.min.js" %}" crossorigin="anonymous"></script>
+    <script src="{% static "v2/js/lib/popper.min.js" %}"></script>
+    <script src="{% static "v2/js/lib/bootstrap.min.js" %}" crossorigin="anonymous"></script>
     <script>
       var bootstrapTooltip = $.fn.tooltip.noConflict()
       var bootstrapModal = $.fn.modal.noConflict()

app/dataviz/templates/cohort.html

@@ -44,7 +44,7 @@
     <!-- code to include the highcharts and jQuery libraries goes here -->
     <!-- load_charts filter takes a comma-separated list of id's where -->
     <!-- the charts need to be rendered to                             -->
-    <script src="{% static "v2/js/jquery.js" %}"></script>
+    <script src="{% static "v2/js/lib/jquery.js" %}"></script>
 </head>
 
 <body>

app/dataviz/templates/dataviz/admin_graph.html

@@ -34,7 +34,7 @@
 {% block content %}
   <head>
     <meta charset="utf-8">
-    <script src="{% static "v2/js/jquery.js" %}"></script>
+    <script src="{% static "v2/js/lib/jquery.js" %}"></script>
     <script src="//d3js.org/d3.v2.min.js?2.9.3"></script>
     <style>
     .colMS{

app/dataviz/templates/dataviz/calendar.html

@@ -2,7 +2,7 @@
 <!DOCTYPE html>
 <body>
 <a href="..">&lt; back</a>
-<script src="{% static "v2/js/jquery.js" %}"></script>
+<script src="{% static "v2/js/lib/jquery.js" %}"></script>
 {% include "dataviz/shared/nav.html" %}
 <br><br>
 <script src="https://d3js.org/d3.v4.min.js"></script>

app/dataviz/templates/dataviz/chord.html

@@ -25,7 +25,7 @@
 <h1> payers (top) / payees (top) </h1>
 <p>The redder the node is the longer it took the bounty hunter to turn around.</p>
 <script src="//d3js.org/d3.v3.min.js"></script>
-<script src="{% static "v2/js/jquery.js" %}"></script>
+<script src="{% static "v2/js/lib/jquery.js" %}"></script>
 <script>
 
 var url = document.location.href + '?data=1&format=csv';

app/dataviz/templates/dataviz/circles.html

@@ -57,7 +57,7 @@
   <svg width="960" height="960"></svg>
 </div>
 <script src="https://d3js.org/d3.v4.min.js"></script>
-<script src="{% static "v2/js/jquery.js" %}"></script>
+<script src="{% static "v2/js/lib/jquery.js" %}"></script>
 <script>
 var svg = d3.select("svg"),
     diameter = +svg.attr("width"),

app/dataviz/templates/dataviz/graph.html

@@ -21,7 +21,7 @@
 
 <link rel="stylesheet" type="text/css" href="{% static "admin/css/dashboard.css" %}">  <head>
     <meta charset="utf-8">
-    <script src="{% static "v2/js/jquery.js" %}"></script>
+    <script src="{% static "v2/js/lib/jquery.js" %}"></script>
     <script src="//d3js.org/d3.v2.min.js?2.9.3"></script>
     <style>
     .colMS{

app/dataviz/templates/dataviz/heatmap.html

@@ -82,7 +82,7 @@
     <title>Days Hours Heatmap</title>
     <meta charset="utf-8"/>
     <script type="text/javascript" src="//d3js.org/d3.v3.js"></script>
-    <script src="{% static "v2/js/jquery.js" %}"></script>
+    <script src="{% static "v2/js/lib/jquery.js" %}"></script>
     <link rel="stylesheet" href="{% static "v2/css/lib/typography.css" %}">
     <link rel="stylesheet" href="{% static "v2/js/dataviz/heatmap.css" %}">
   </head>

app/dataviz/templates/dataviz/scatterplot.html

@@ -42,7 +42,7 @@
     {% include "dataviz/shared/nav.html" %}
 <br>
 <h1> Hourly Rate of Bounties over Time, by Repo</h1>
-<script src="{% static "v2/js/jquery.js" %}"></script>
+<script src="{% static "v2/js/lib/jquery.js" %}"></script>
 <script src="//d3js.org/d3.v3.min.js"></script>
 <script>
 function average(data){

app/dataviz/templates/dataviz/scatterplot_stripped.html

@@ -19,7 +19,7 @@
 }
 </style>
 
-<script src="{% static "v2/js/jquery.js" %}"></script>
+<script src="{% static "v2/js/lib/jquery.js" %}"></script>
 <script src="//d3js.org/d3.v3.min.js"></script>
 <script>
 var margin = {top: 20, right: 20, bottom: 30, left: 40},

app/dataviz/templates/dataviz/spiral.html

@@ -88,7 +88,7 @@
   <h2>{{key}}</h2>
   {% include "dataviz/shared/nav.html" %}
   <div id="chart"></div>
-  <script src="{% static "v2/js/jquery.js" %}"></script>
+  <script src="{% static "v2/js/lib/jquery.js" %}"></script>
   <script>
   var someData = [];
   {% for stat in stats %}

app/dataviz/templates/dataviz/square_graph.html

@@ -47,7 +47,7 @@
 <!DOCTYPE html>
 <html>
     <head>
-        <script src="{% static "v2/js/jquery.js" %}"></script>
+        <script src="{% static "v2/js/lib/jquery.js" %}"></script>
         <meta charset="UTF-8">
         <meta name="viewport" content="width=device-width, initial-scale=1.0">
         <script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/d3/3.5.5/d3.js"></script>

app/dataviz/templates/dataviz/steamgraph.html

@@ -71,7 +71,7 @@
 <h1>Bounties by repo volume that were in status at this time</h1>
 {% include "dataviz/shared/nav.html" %}
 <script src="//d3js.org/d3.v2.js"></script>
-<script src="{% static "v2/js/jquery.js" %}"></script>
+<script src="{% static "v2/js/lib/jquery.js" %}"></script>
 <br>
 <br>
 <br>

app/dataviz/templates/dataviz/sunburst.html

@@ -31,7 +31,7 @@
 <head>
   <meta charset="utf-8">
   <script src="//d3js.org/d3.v3.min.js"></script>
-  <script src="{% static "v2/js/jquery.js" %}"></script>
+  <script src="{% static "v2/js/lib/jquery.js" %}"></script>
   <link rel="stylesheet" href="{% static "v2/css/lib/typography.css" %}">
   <link rel="stylesheet" type="text/css" href="{% static "v2/js/dataviz/sequences.css" %}">
 </head>

app/dataviz/templates/funnel.html

@@ -44,7 +44,7 @@
     <!-- code to include the highcharts and jQuery libraries goes here -->
     <!-- load_charts filter takes a comma-separated list of id's where -->
     <!-- the charts need to be rendered to                             -->
-    <script src="{% static "v2/js/jquery.js" %}"></script>
+    <script src="{% static "v2/js/lib/jquery.js" %}"></script>
 </head>
 
 <body>

app/dataviz/templates/stats.html

@@ -47,7 +47,7 @@
   <!-- code to include the highcharts and jQuery libraries goes here -->
   <!-- load_charts filter takes a comma-separated list of id's where -->
   <!-- the charts need to be rendered to                             -->
-  <script src="{% static "v2/js/jquery.js" %}"></script>
+  <script src="{% static "v2/js/lib/jquery.js" %}"></script>
   {% if format == 'chart' %}
     {% load chartit %}
     <script src='https://code.highcharts.com/highcharts.js'></script>

app/event_ethdenver2019/templates/ethdenver2019/onepager.html

@@ -25,7 +25,7 @@
     <meta name="description" content="{{card_desc}}">
     <meta charset="utf-8" />
     <meta name=viewport content="width=device-width,initial-scale=1,maximum-scale=1,user-scalable=no">
-    <script src="{% static "v2/js/jquery.js" %}"></script>
+    <script src="{% static "v2/js/lib/jquery.js" %}"></script>
     <script src="{% static "v2/js/work_with_gitcoin.js" %}"></script>
     <script src="{% static "v2/js/shared.js" %}"></script>
     <script src="{% static "v2/js/event_ethdenver2019/blockies.js" %}"></script>