From 9c9e26dde50348f583a3c1e5fcf1bd569451ae66 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rapha=C3=ABl=20Vinot?= <raphael@vinot.info>
Date: Mon, 25 Oct 2021 17:19:22 -0400
Subject: [PATCH] chg: Improve capture page

Related to #279
---
 website/web/__init__.py            | 2 +-
 website/web/sri.txt                | 4 ++--
 website/web/static/capture.js      | 7 -------
 website/web/static/generic.css     | 3 +--
 website/web/templates/capture.html | 3 ---
 5 files changed, 4 insertions(+), 15 deletions(-)

diff --git a/website/web/__init__.py b/website/web/__init__.py
index b5434a34..dacb9031 100644
--- a/website/web/__init__.py
+++ b/website/web/__init__.py
@@ -858,7 +858,7 @@ def capture_web():
                 flash('Invalid proxy: Check that you entered a scheme, a hostname and a port.', 'error')
 
         perma_uuid = lookyloo.enqueue_capture(capture_query, source='web', user=user, authenticated=flask_login.current_user.is_authenticated)
-        time.sleep(30)
+        time.sleep(2)
         return redirect(url_for('tree', tree_uuid=perma_uuid))
     elif request.method == 'GET' and request.args.get('url'):
         url = unquote_plus(request.args['url']).strip()
diff --git a/website/web/sri.txt b/website/web/sri.txt
index dab4bc78..6d4c06fa 100644
--- a/website/web/sri.txt
+++ b/website/web/sri.txt
@@ -1,7 +1,7 @@
 {
   "static": {
     "bomb.svg": "Tro3+kCLzfBNBve2gPnsmXsl+tHUQVrFz77zfrWwnAuTraehZaoAfVJgGOYdG8zceXdGLEKzXVi3GdtEXw0sYQ==",
-    "capture.js": "XhWkFmPwm29Iyf034SS/OXZo+ulN2xo6S6AzdHh+hCBnmygO8dUzX1gsrW91utgxgsmHKjTzXPJCXsylNLw4uQ==",
+    "capture.js": "wdtRc1v2F4NwxeXo5UqHmiKB2vHNptTM0tLCxuIN5HdjgV2ITVNP5Zva0T5fQx00HGIefs5jBcUdjIl7LMb3vQ==",
     "check.svg": "CRqUAM/yXxgJwpfg3TeoKD+CIqQj62lxqS3zeCmdPaV3dKftk4jk5Mqc1TGxL7i61X1sgV0/f+KJLEOKTw01ww==",
     "cookie_in_url.png": "hs/oNPnrR2DkDX9Yp6Daug/QqpWJHemJE6lXpxNafjgOYooezp3DpbqKqADT7QcfcTxxUfe1iPDZJlHOrNMAcw==",
     "cookie_read.png": "mdXCeuNFPvshSwIXAJLoR1xFjXb+K2Mgu47Q1fnUAO8j1N2c/uJuE8sGuBHHbS8HOyr/CbOC6Uf3zsm9KvAs8Q==",
@@ -17,7 +17,7 @@
     "exe.png": "pWwo9nBLtEss/UJ173zHa6/RpySUyz/XMdNhWc6aRIvwwHMO6a+fLmu2K6TbvO3Jbg4VYL2Af4yhHPyhH3ZeTw==",
     "favicon.ico": "KOmrfwRbOQqhhwSeBkNpMRAxSVMmmLg+2kRMg9iSv7OWjE9spJc7x4MKB4AE/hi0knaV7UBVctAU6XZ7AC72ZA==",
     "font.png": "RwoQkj9dT9SLUL2F7cAA16Nat9t2hDb58eQlHF9ThUar829p0INUXG+5XuDaFOC8SsmCZK5vw2f+YAQ6mLC1Qw==",
-    "generic.css": "y5crC022oxKIDs2Z2l3HSIwzmPtXNYd6N8ofJYgu1OsSAADO3qoZ1OZVrsdwn1e9wHK4Mvh6GpKoe+GcDzOmSQ==",
+    "generic.css": "tOle/VKgBbxUUWM9T9xnp5WI4a4aP8ZX+3RZ1K02yKlRauegJxV+en5TJZZmIBuIYuB4rQoVzP5m0ykhS3Noaw==",
     "generic.js": "c/p+6Dk2kcwd9T9kf/IfoCX/ZU+VbtlUGYBo3qNSzwoUYC1soWwdIwM5rFxwxz9a1tORc/Wu0EFCPRw4ZwbqkQ==",
     "html.png": "T7pZrb8MMDsA/JV/51hu+TOglTqlxySuEVY0rpDjTuAEyhzk2v+W4kYrj7vX+Tp3n2d2lvVD08PwhCG62Yfbzg==",
     "ifr.png": "rI5YJypmz1QcULRf9UaOYSqV4tPUSxUdLAycoYzCwywt4Pw4eWzBg9SUr769VyIimoiIyJR+aNuoIA4p5WO2fQ==",
diff --git a/website/web/static/capture.js b/website/web/static/capture.js
index cf63fcb0..218ab5f1 100644
--- a/website/web/static/capture.js
+++ b/website/web/static/capture.js
@@ -31,10 +31,3 @@ $('select[name="browser"]').change(function(){
   $("[id='" + os_name + '_' + browser_name + "']").show();
   $("[id='" + os_name + '_' + browser_name + "'] > div > select").removeAttr('disabled');
 });
-
-$('#btn-looking').click(function() {
-  $('#btn-looking').html('<span class="spinner-border spinner-border-sm mr-2" role="status" aria-hidden="true"></span>Looking...').addClass('disabled');
-  $('#long').fadeOut(0).delay(9000).fadeIn(100);
-  $('#too-long').fadeOut(0).delay(19000).fadeIn(100);
-  $('#way-too-long').fadeOut(0).delay(27000).fadeIn(100);
-});
diff --git a/website/web/static/generic.css b/website/web/static/generic.css
index 8703fffa..6ed3456c 100644
--- a/website/web/static/generic.css
+++ b/website/web/static/generic.css
@@ -1,9 +1,8 @@
 /* Capture button */
 .new-capture-button {
-  width: 300px;
+  width: 270px;
   height: 60px;
   font-size: 25px;
-  letter-spacing: 2.5px;
   font-weight: 500;
   color: #ffffff;
   background-color: #0000ff;
diff --git a/website/web/templates/capture.html b/website/web/templates/capture.html
index 3b5033da..8d92bd11 100644
--- a/website/web/templates/capture.html
+++ b/website/web/templates/capture.html
@@ -148,9 +148,6 @@
         </br>
         </br>
         <button type="submit" class="new-capture-button" id="btn-looking">Start looking!</button>
-        <div id="long" style="display:none">Please wait, it can take a while on big websites...</div>
-        <div id="too-long" style="display:none">... No, really, I mean it.</div>
-        <div id="way-too-long" style="display:none">Told ya!</div>
       </center>
   </form>
 </div>