From e744352ec32809f791754fe7828c7e81813b24c7 Mon Sep 17 00:00:00 2001
From: Alexander Kabui
Date: Wed, 16 Dec 2020 14:57:37 +0300
Subject: Replace jquery libs(jquery cookie,jquery ui,jquery js) (#512)

* replace jquery-ui in templates

* replace jquery-cookie library in templates

* replace jquery.min.js in templates

* add jquery-ui to mechanical rob

* add  jquery-cookie to mechanical rob

* add jquery min  js to mechanical rob

Co-authored-by: BonfaceKilz <bonfacemunyoki@gmail.com>---
 wqflask/wqflask/templates/base.html    | 6 +++---
 wqflask/wqflask/templates/loading.html | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'wqflask')

diff --git a/wqflask/wqflask/templates/base.html b/wqflask/wqflask/templates/base.html
index bb618294..e368a4be 100644
--- a/wqflask/wqflask/templates/base.html
+++ b/wqflask/wqflask/templates/base.html
@@ -238,7 +238,7 @@
       <!--</div>-->
     </div>
 
-    <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.10.2/jquery.min.js"></script>
+    <script src="{{ url_for('js', filename='jquery/jquery.min.js') }}" type="text/javascript"></script>
     <script src="/static/packages/bootstrap/js/bootstrap.min.js"></script>
     <script>
             //http://stackoverflow.com/questions/11521763/bootstrap-scrollspy-not-working
@@ -250,9 +250,9 @@
               }
             })
     </script>
-    <script src="/static/new/js_external/jquery.cookie.js"></script>
+    <script src="{{ url_for('js', filename='jquery-cookie/jquery.cookie.js') }}" type="text/javascript"></script>
     <script type="text/javascript" src="/static/new/js_external/json2.js"></script>
-    <script src="https://ajax.googleapis.com/ajax/libs/jqueryui/1.9.1/jquery-ui.min.js" type="text/javascript"></script>
+    <script src="{{ url_for('js', filename='jquery-ui/jquery-ui.min.js') }}" type="text/javascript"></script>
 
     <script language="javascript" type="text/javascript" src="{{ url_for('js', filename='colorbox/jquery.colorbox-min.js') }}"></script>
     <!--<script type="text/javascript" src="/static/new/javascript/login.js"></script>-->
diff --git a/wqflask/wqflask/templates/loading.html b/wqflask/wqflask/templates/loading.html
index 9b335dfe..94e17724 100644
--- a/wqflask/wqflask/templates/loading.html
+++ b/wqflask/wqflask/templates/loading.html
@@ -38,7 +38,7 @@
     </div>
   </div>
 </form>
-<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.10.2/jquery.min.js"></script>
+<script src="{{ url_for('js', filename='jquery/jquery.min.js') }}" type="text/javascript"></script>
 <script src="/static/packages/bootstrap/js/bootstrap.min.js"></script>
 <script  type="text/javascript">
 
-- 
cgit v1.2.3


From 3a4fb64d27e59f38042ef51b79aedbd1d9163b9e Mon Sep 17 00:00:00 2001
From: Alexander Kabui
Date: Wed, 16 Dec 2020 15:02:55 +0300
Subject: Replace shapiro wilk lib (#528)

* replace shapiro-wilk in templates

* add shapiro-wilk.js to mechanical rob---
 test/requests/link_checker.py             | 1 +
 wqflask/wqflask/templates/show_trait.html | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

(limited to 'wqflask')

diff --git a/test/requests/link_checker.py b/test/requests/link_checker.py
index eb27d9fe..f73ec185 100644
--- a/test/requests/link_checker.py
+++ b/test/requests/link_checker.py
@@ -144,6 +144,7 @@ def check_packaged_js_files(args_obj, parser):
         "/js/javascript-twitter-post-fetcher/js/twitterFetcher_min.js",
         "/js/DataTables/images/sort_asc_disabled.png",
         "/js/DataTables/images/sort_desc_disabled.png",
+        "/js/shapiro-wilk/shapiro-wilk.js",
     ]
 
     print("Checking links")
diff --git a/wqflask/wqflask/templates/show_trait.html b/wqflask/wqflask/templates/show_trait.html
index 32cf3c0a..c881eb76 100644
--- a/wqflask/wqflask/templates/show_trait.html
+++ b/wqflask/wqflask/templates/show_trait.html
@@ -133,7 +133,7 @@
     <script type="text/javascript" src="{{ url_for('js', filename='underscore-string/underscore.string.min.js') }}"></script>
     <script type="text/javascript" src="{{ url_for('js', filename='d3-tip/d3-tip.js') }}"></script>
     <script type="text/javascript" src="{{ url_for('js', filename='js_alt/jstat.min.js') }}"></script>
-    <script type="text/javascript" src="/static/new/js_external/shapiro-wilk.js"></script>
+    <script type="text/javascript" src="{{ url_for('js', filename='shapiro-wilk/shapiro-wilk.js') }}"></script>
     <script type="text/javascript" src="{{ url_for('js', filename='plotly/plotly.min.js') }}"></script>
     <script type="text/javascript" src="/static/new/javascript/colorbrewer.js"></script>
 
-- 
cgit v1.2.3


From 218a2aa198cb70761ddd20c94169941f3ea86188 Mon Sep 17 00:00:00 2001
From: Alexander Kabui
Date: Wed, 16 Dec 2020 15:03:15 +0300
Subject: Replace zxcvbn async (#524)

* replace axcbn-async in templates

* add zxcvbn-async.min.js in mechanical rob

Co-authored-by: BonfaceKilz <bonfacemunyoki@gmail.com>---
 test/requests/link_checker.py                                         | 1 +
 wqflask/wqflask/templates/new_security/forgot_password_step2.html     | 2 +-
 wqflask/wqflask/templates/new_security/password_reset.html            | 2 +-
 wqflask/wqflask/templates/new_security/register_user.html             | 2 +-
 wqflask/wqflask/templates/new_security/registered.html                | 2 +-
 wqflask/wqflask/templates/new_security/thank_you.html                 | 2 +-
 wqflask/wqflask/templates/new_security/verification_still_needed.html | 2 +-
 7 files changed, 7 insertions(+), 6 deletions(-)

(limited to 'wqflask')

diff --git a/test/requests/link_checker.py b/test/requests/link_checker.py
index f73ec185..bc3b5861 100644
--- a/test/requests/link_checker.py
+++ b/test/requests/link_checker.py
@@ -141,6 +141,7 @@ def check_packaged_js_files(args_obj, parser):
         "/js/cytoscape-panzoom/cytoscape.js-panzoom.css",
         "/js/cytoscape-qtip/cytoscape-qtip.js",
         "/css/d3-tip/d3-tip.css",
+        "/js/zxcvbn-async/zxcvbn-async.min.js",
         "/js/javascript-twitter-post-fetcher/js/twitterFetcher_min.js",
         "/js/DataTables/images/sort_asc_disabled.png",
         "/js/DataTables/images/sort_desc_disabled.png",
diff --git a/wqflask/wqflask/templates/new_security/forgot_password_step2.html b/wqflask/wqflask/templates/new_security/forgot_password_step2.html
index 473fa377..5dc424e5 100644
--- a/wqflask/wqflask/templates/new_security/forgot_password_step2.html
+++ b/wqflask/wqflask/templates/new_security/forgot_password_step2.html
@@ -21,6 +21,6 @@
 
 {% block js %}
     {% include "new_security/_scripts.html" %}
-    <script type="text/javascript" src="/static/new/js_external/zxcvbn/zxcvbn-async.js"></script>
+    <script language="javascript" type="text/javascript" src="{{ url_for('js', filename='zxcvbn-async/zxcvbn-async.min.js') }}"></script>
     <script type="text/javascript" src="/static/new/javascript/password_strength.js"></script>
 {% endblock %}
diff --git a/wqflask/wqflask/templates/new_security/password_reset.html b/wqflask/wqflask/templates/new_security/password_reset.html
index 7110dc79..4e3ea59f 100644
--- a/wqflask/wqflask/templates/new_security/password_reset.html
+++ b/wqflask/wqflask/templates/new_security/password_reset.html
@@ -74,6 +74,6 @@
 {% block js %}
 
     {% include "new_security/_scripts.html" %}
-    <script type="text/javascript" src="/static/new/js_external/zxcvbn/zxcvbn-async.js"></script>
+    <script language="javascript" type="text/javascript" src="{{ url_for('js', filename='zxcvbn-async/zxcvbn-async.min.js') }}"></script>
     <script type="text/javascript" src="/static/new/javascript/password_strength.js"></script>
 {% endblock %}
diff --git a/wqflask/wqflask/templates/new_security/register_user.html b/wqflask/wqflask/templates/new_security/register_user.html
index 325d8aa5..2506f4ee 100644
--- a/wqflask/wqflask/templates/new_security/register_user.html
+++ b/wqflask/wqflask/templates/new_security/register_user.html
@@ -101,6 +101,6 @@
 {% block js %}
 
     {% include "new_security/_scripts.html" %}
-    <script type="text/javascript" src="/static/new/js_external/zxcvbn/zxcvbn-async.js"></script>
+    <script language="javascript" type="text/javascript" src="{{ url_for('js', filename='zxcvbn-async/zxcvbn-async.min.js') }}"></script>
     <script type="text/javascript" src="/static/new/javascript/password_strength.js"></script>
 {% endblock %}
diff --git a/wqflask/wqflask/templates/new_security/registered.html b/wqflask/wqflask/templates/new_security/registered.html
index e71d5598..eaed3ed0 100644
--- a/wqflask/wqflask/templates/new_security/registered.html
+++ b/wqflask/wqflask/templates/new_security/registered.html
@@ -20,6 +20,6 @@
 {% block js %}
 
     {% include "new_security/_scripts.html" %}
-    <script type="text/javascript" src="/static/new/js_external/zxcvbn/zxcvbn-async.js"></script>
+    <script language="javascript" type="text/javascript" src="{{ url_for('js', filename='zxcvbn-async/zxcvbn-async.min.js') }}"></script>
     <script type="text/javascript" src="/static/new/javascript/password_strength.js"></script>
 {% endblock %}
diff --git a/wqflask/wqflask/templates/new_security/thank_you.html b/wqflask/wqflask/templates/new_security/thank_you.html
index 459bd66a..f492fb51 100644
--- a/wqflask/wqflask/templates/new_security/thank_you.html
+++ b/wqflask/wqflask/templates/new_security/thank_you.html
@@ -19,6 +19,6 @@
 
 {% block js %}
     {% include "new_security/_scripts.html" %}
-    <script type="text/javascript" src="/static/new/js_external/zxcvbn/zxcvbn-async.js"></script>
+    <script language="javascript" type="text/javascript" src="{{ url_for('js', filename='zxcvbn-async/zxcvbn-async.min.js') }}"></script>
     <script type="text/javascript" src="/static/new/javascript/password_strength.js"></script>
 {% endblock %}
diff --git a/wqflask/wqflask/templates/new_security/verification_still_needed.html b/wqflask/wqflask/templates/new_security/verification_still_needed.html
index 3aa24e37..91768eb9 100644
--- a/wqflask/wqflask/templates/new_security/verification_still_needed.html
+++ b/wqflask/wqflask/templates/new_security/verification_still_needed.html
@@ -22,6 +22,6 @@
 
 {% block js %}
     {% include "new_security/_scripts.html" %}
-    <script type="text/javascript" src="/static/new/js_external/zxcvbn/zxcvbn-async.js"></script>
+    <script language="javascript" type="text/javascript" src="{{ url_for('js', filename='zxcvbn-async/zxcvbn-async.min.js') }}"></script>
     <script type="text/javascript" src="/static/new/javascript/password_strength.js"></script>
 {% endblock %}
-- 
cgit v1.2.3