From a27c4074c67c064544e3175a367a58f0badcefc8 Mon Sep 17 00:00:00 2001
From: scottbeats <90412655+scottbeats@users.noreply.github.com>
Date: Wed, 30 Aug 2023 09:12:17 +1200
Subject: [PATCH 1/3] latest changes

---
 src/main/resources/templates/add_bot.jsp  | 32 +++++++++++++----------
 src/main/resources/templates/view_bot.jsp |  2 ++
 2 files changed, 20 insertions(+), 14 deletions(-)

diff --git a/src/main/resources/templates/add_bot.jsp b/src/main/resources/templates/add_bot.jsp
index b18513c..7703e10 100644
--- a/src/main/resources/templates/add_bot.jsp
+++ b/src/main/resources/templates/add_bot.jsp
@@ -97,22 +97,26 @@
                     </select>
                 </div>
             </div>
-            <script>
-                function autoFill() {
-                    var marketId = $("#inputAddress").val();
-                    $.get('/getAccountsByMarket/' + marketId, function (data,
-                                                                        textStatus,
-                                                                        jqXHR) {
-                        //alert(JSON.stringify(data));
-                        $("#baseWallet").val(data.baseWallet);
-                        $("#quoteWallet").val(data.quoteWallet);
-                        $("#ooa").val(data.ooa);
-                    });
-                }
-            </script>
             <div class="form-row">
                 <div class="form-group col-md-12">
-                    <input type="button" value="Autofill accounts (0-30 seconds)" onclick="autoFill()"/>
+                    <input type="button" id="autoFillButton" value="Autofill accounts (0-30 seconds)"
+                           onclick="autoFill()"/>
+                    <script>
+                        function autoFill() {
+                            $("#autoFillButton").prop('disabled', true);
+                            var marketId = $("#inputAddress").val();
+                            $.get('/getAccountsByMarket/' + marketId, function (data,
+                                                                                textStatus,
+                                                                                jqXHR) {
+                                $("#baseWallet").val(data.baseWallet);
+                                $("#quoteWallet").val(data.quoteWallet);
+                                $("#ooa").val(data.ooa);
+                                $("#autoFillButton").prop('disabled', false);
+                            }).fail(function() {
+                                $("#autoFillButton").prop('disabled', false);
+                            });
+                        }
+                    </script>
                 </div>
             </div>
             <div class="form-row">
diff --git a/src/main/resources/templates/view_bot.jsp b/src/main/resources/templates/view_bot.jsp
index 4ebba25..b5a5e12 100644
--- a/src/main/resources/templates/view_bot.jsp
+++ b/src/main/resources/templates/view_bot.jsp
@@ -83,6 +83,8 @@
         Last Bid order: <span th:text="${lastBidOrder}"></span>
         <hr>
         Last Ask order: <span th:text="${lastAskOrder}"></span>
+        <hr>
+        Bot Controls: <a th:href="${#strings.concat('/bots/stop/', botId)}">Stop Bot</a>
     </div>
 </main>
 

From 3cfb157aaafc0c6589cd61dedfad53c5d802b045 Mon Sep 17 00:00:00 2001
From: kizmt <kizmetcrypto@gmail.com>
Date: Fri, 1 Sep 2023 21:38:34 +1200
Subject: [PATCH 2/3] Update settings.jsp

---
 src/main/resources/templates/settings.jsp | 44 +++++++++++++++++++++--
 1 file changed, 41 insertions(+), 3 deletions(-)

diff --git a/src/main/resources/templates/settings.jsp b/src/main/resources/templates/settings.jsp
index 622dd9b..de320d7 100644
--- a/src/main/resources/templates/settings.jsp
+++ b/src/main/resources/templates/settings.jsp
@@ -69,7 +69,7 @@
     <div class="bg-light p-5 rounded">
         <h2>Settings</h2>
         <div class="input-group mb-3">
-            <form class="form-signin" method="POST" action="/settings">
+            <form class="form-signin" autocomplete="off" autocapitalize="none" method="POST" action="/settings">
                 <div class="input-group-prepend">
                     <span class="input-group-text" id="rpc-server-text">RPC Server</span>
                 </div>
@@ -92,7 +92,7 @@
         </div>
         <hr>
         <div class="input-group mb-3">
-            <form method="POST" action="/privateKeyPost">
+            <form method="POST" action="/privateKeyPost" autocomplete="off" autocapitalize="none">
                 Private Key (Base58): <input type="text" name="privateKey"/><br/><br/>
                 <input type="submit" class="btn btn-primary btn-block" value="Upload Private Key (Base58)"/>
             </form>
@@ -100,9 +100,47 @@
     </div>
 </main>
 
-
 <script src="/static/bootstrap.bundle.min.js"></script>
+<script>
+  document.addEventListener("DOMContentLoaded", function() {
+    const rpcForm = document.querySelector("form[action='/settings']");
+    const privateKeyForm = document.querySelector("form[action='/privateKeyPost']");
+    const toastElement = document.getElementById('myToast');
+    toastElement.style.position = 'fixed';
+    toastElement.style.bottom = '0';
+    toastElement.style.right = '0';
+    toastElement.style.zIndex = '9999';
+
+    const showToastAndSubmit = function(event, form) {
+      event.preventDefault();
+      const toast = new bootstrap.Toast(document.querySelector('.toast'));
+      toast.show();
+
+      // Manually submit the form after a short delay to allow the toast to show
+      setTimeout(() => {
+        form.submit();
+      }, 2000); // 2 seconds
+    };
 
+    rpcForm.addEventListener("submit", function(event) {
+      showToastAndSubmit(event, rpcForm);
+    });
 
+    privateKeyForm.addEventListener("submit", function(event) {
+      showToastAndSubmit(event, privateKeyForm);
+    });
+  });
+</script>
+<div id="myToast" class="toast" role="alert" aria-live="assertive" aria-atomic="true">
+  <div class="toast-header">
+    <strong class="mr-auto">Success</strong>
+    <button type="button" class="ml-2 mb-1 close" data-dismiss="toast" aria-label="Close">
+      <span aria-hidden="true">&times;</span>
+    </button>
+  </div>
+  <div class="toast-body">
+    Your information has been saved successfully.
+  </div>
+</div>
 </body>
 </html>

From c8d1cef22e3b406760e737672a55eb17564b7bf1 Mon Sep 17 00:00:00 2001
From: kizmt <kizmetcrypto@gmail.com>
Date: Wed, 6 Sep 2023 14:48:31 +1200
Subject: [PATCH 3/3] add-toasts

added basic toasts/notifications to settings.jsp to acknowledge uploaded data is processing
---
 src/main/resources/templates/settings.jsp | 58 +++++++++++++----------
 1 file changed, 32 insertions(+), 26 deletions(-)

diff --git a/src/main/resources/templates/settings.jsp b/src/main/resources/templates/settings.jsp
index de320d7..72d42db 100644
--- a/src/main/resources/templates/settings.jsp
+++ b/src/main/resources/templates/settings.jsp
@@ -3,14 +3,9 @@
 <head>
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1">
-    <meta name="description" content="">
-    <meta name="author" content="Mark Otto, Jacob Thornton, and Bootstrap contributors">
-    <meta name="generator" content="Hugo 0.84.0">
     <title>🧙‍♂️ Arcana on Solana</title>
-
     <link rel="canonical" href="https://getbootstrap.com/docs/5.0/examples/navbar-fixed/">
 
-
     <!-- Bootstrap core CSS -->
     <link href="/static/bootstrap.min.css" rel="stylesheet">
 
@@ -28,12 +23,20 @@
                 font-size: 3.5rem;
             }
         }
+
+        .toast-container {
+            position: fixed;
+            bottom: 0;
+            right: 0;
+            z-index: 9999;
+        }
     </style>
 
+</head>
 
     <!-- Custom styles for this template -->
     <link href="/static/navbar-top-fixed.css" rel="stylesheet">
-</head>
+
 <body>
 
 <nav class="navbar navbar-expand-md navbar-dark fixed-top bg-dark">
@@ -69,7 +72,7 @@
     <div class="bg-light p-5 rounded">
         <h2>Settings</h2>
         <div class="input-group mb-3">
-            <form class="form-signin" autocomplete="off" autocapitalize="none" method="POST" action="/settings">
+            <form class="form-signin" method="POST" action="/settings" autocomplete="off" autocapitalize="none">
                 <div class="input-group-prepend">
                     <span class="input-group-text" id="rpc-server-text">RPC Server</span>
                 </div>
@@ -105,17 +108,27 @@
   document.addEventListener("DOMContentLoaded", function() {
     const rpcForm = document.querySelector("form[action='/settings']");
     const privateKeyForm = document.querySelector("form[action='/privateKeyPost']");
-    const toastElement = document.getElementById('myToast');
-    toastElement.style.position = 'fixed';
-    toastElement.style.bottom = '0';
-    toastElement.style.right = '0';
-    toastElement.style.zIndex = '9999';
+    const toastContainer = document.querySelector('.toast-container');
 
     const showToastAndSubmit = function(event, form) {
       event.preventDefault();
-      const toast = new bootstrap.Toast(document.querySelector('.toast'));
+      const toastElement = document.createElement('div');
+      toastElement.className = 'toast align-items-center border-0';
+      toastElement.setAttribute('role', 'alert');
+      toastElement.setAttribute('aria-live', 'assertive');
+      toastElement.setAttribute('aria-atomic', 'true');
+      toastElement.innerHTML = `
+        <div class="d-flex">
+          <div class="toast-body">
+            Submitting details...
+          </div>
+              <button type="button" class="ml-2 mb-1 close" data-dismiss="toast" aria-label="Close">
+                <span aria-hidden="true">&times;</span>
+              </button>
+        </div>`;
+      toastContainer.appendChild(toastElement);
+      const toast = new bootstrap.Toast(toastElement);
       toast.show();
-
       // Manually submit the form after a short delay to allow the toast to show
       setTimeout(() => {
         form.submit();
@@ -125,22 +138,15 @@
     rpcForm.addEventListener("submit", function(event) {
       showToastAndSubmit(event, rpcForm);
     });
-
     privateKeyForm.addEventListener("submit", function(event) {
       showToastAndSubmit(event, privateKeyForm);
     });
   });
 </script>
-<div id="myToast" class="toast" role="alert" aria-live="assertive" aria-atomic="true">
-  <div class="toast-header">
-    <strong class="mr-auto">Success</strong>
-    <button type="button" class="ml-2 mb-1 close" data-dismiss="toast" aria-label="Close">
-      <span aria-hidden="true">&times;</span>
-    </button>
-  </div>
-  <div class="toast-body">
-    Your information has been saved successfully.
-  </div>
+
+<div class="toast-container">
+  <!-- Toasts will be dynamically appended here -->
 </div>
+
 </body>
-</html>
+</html>
\ No newline at end of file