From 37dcaa41f15a803d82635af39697086990655b33 Mon Sep 17 00:00:00 2001
From: billz <billzimmerman@gmail.com>
Date: Thu, 23 Nov 2023 07:51:43 +0000
Subject: [PATCH] Create performupdateModal w/ progress steps

---
 templates/about.php | 70 ++++++++++++++++++++++++++++++++++++++++-----
 1 file changed, 63 insertions(+), 7 deletions(-)

diff --git a/templates/about.php b/templates/about.php
index 4aa95e4b..b0c40d59 100755
--- a/templates/about.php
+++ b/templates/about.php
@@ -42,7 +42,7 @@ require_once 'app/lib/Parsedown.php';
   <div class="modal-dialog" role="document">
     <div class="modal-content">
       <div class="modal-header">
-      <div class="modal-title" id="ModalLabel"><i class="fas fa-sync-alt fa-spin mr-2"></i><?php echo _("Check for update"); ?></div>
+      <div class="modal-title" id="ModalLabel"><i class="fas fa-sync-alt fa-spin mr-2" id="updateSync"></i><?php echo _("Check for update"); ?></div>
       </div>
       <div class="modal-body">
         <div class="col-md-12 mb-3 mt-1" id="msg-check-update"><?php echo _("New release check in progress..."); ?></div>
@@ -58,21 +58,77 @@ require_once 'app/lib/Parsedown.php';
   </div>
 </div>
 
+<!-- modal auth-credentials-->
+<div class="modal fade" id="authupdateModal" tabindex="-1" role="dialog" aria-labelledby="ModalLabel" aria-hidden="true">
+  <div class="modal-dialog" role="document">
+    <div class="modal-content">
+      <form id="authUpdate" class="needs-validation" novalidate>
+        <div class="modal-header">
+          <div class="modal-title" id="ModalLabel"><i class="fab fa-github mr-2"></i><?php echo _("GitHub authentication"); ?></div>
+        </div>
+        <div class="modal-body">
+          <div class="row">
+            <div class="col-md-12 mb-2 mt-1 ml-4" id="msg-github-auth"><?php echo _("Updating Insiders requires GitHub authentication."); ?></div>
+          </div>
+          <div class="row">
+            <div class="col-xs mb-3 ml-3 mt-3">
+              <i class="fas fa-exclamation-circle" style="color: #f6c23e; font-size: 1.35em;"></i>
+            </div>
+            <div class="col-md mb-2 mt-1 mr-3">
+              <small><?php echo _("Your credentials will be sent to GitHub securely with SSL. However, use caution if your RaspAP install is on a WLAN shared by untrusted users."); ?></small>
+            </div>
+          </div>
+          <div class="row">
+            <div class="form-group col-md-10 mt-2 ml-5">
+              <label for="username"><?php echo _("Username"); ?></label>
+              <input type="text" class="form-control" id="ghUser" required />
+              <div class="invalid-feedback"><?php echo _("Please provide a valid username."); ?></div>
+            </div>
+          </div>
+          <div class="row">
+            <div class="form-group col-md-10 ml-5 mb-4">
+              <div class="mb-2"><?php echo _("Personal Access Token"); ?></div>
+              <div class="input-group">
+                <input type="password" class="form-control" id="ghToken" required />
+                <div class="input-group-append">
+                  <button class="btn btn-light js-toggle-password" type="button" data-target="[id=ghToken]" data-toggle-with="fas fa-eye-slash"><i class="fas fa-eye mx-2"></i></button>
+                </div>
+                <div class="invalid-feedback"><?php echo _("Please provide a valid token."); ?></div>
+              </div>
+            </div>
+          </div>
+        </div><!-- /.modal-body -->
+        <div class="modal-footer">
+          <button type="button" class="btn btn-outline-secondary" data-dismiss="modal"><?php echo _("Cancel"); ?></button>
+          <button type="submit" class="btn btn-outline btn-primary"><?php echo _("Perform update"); ?></button>
+        </div>
+      </form>
+    </div>
+  </div>
+</div>
+
 <!-- modal update-cmd -->
-<div class="modal fade" id="cmdupdateModal" tabindex="-1" role="dialog" aria-labelledby="ModalLabel" aria-hidden="true">
+<div class="modal fade" id="performupdateModal" tabindex="-1" role="dialog" aria-labelledby="ModalLabel" aria-hidden="true">
   <div class="modal-dialog" role="document">
     <div class="modal-content">
       <div class="modal-header">
-      <div class="modal-title" id="ModalLabel"><i class="fas fa-terminal mr-2"></i><?php echo _("Update command"); ?></div>
+      <div class="modal-title" id="ModalLabel"><i class="fas fa-sync-alt fa-spin mr-2" id="updateSync2"></i><?php echo _("Update in progress"); ?></div>
       </div>
       <div class="modal-body">
-        <div class="col-md-12 mb-3 mt-1" id="msg-check-update"><?php echo _("Copy the following and execute it in the terminal:"); ?></div>
-        <textarea class="logoutput ml-2 cmd-copy" id="shellCmd"></textarea>
+        <div class="col-md-12 mb-3 mt-1" id="msg-check-update"><?php echo _("Application is being updated..."); ?></div>
+        <div class="ml-5"><i class="fas fa-check mr-2 invisible" id="updateStep1"></i><?php echo _("Configuring update"); ?></div>
+        <div class="ml-5"><i class="fas fa-check mr-2 invisible" id="updateStep2"></i><?php echo _("Updating sources"); ?></div>
+        <div class="ml-5"><i class="fas fa-check mr-2 invisible" id="updateStep3"></i><?php echo _("Installing package updates"); ?></div>
+        <div class="ml-5"><i class="fas fa-check mr-2 invisible" id="updateStep4"></i><?php echo _("Downloading latest files"); ?></div>
+        <div class="ml-5"><i class="fas fa-check mr-2 invisible" id="updateStep5"></i><?php echo _("Installing application"); ?></div>
+        <div class="ml-5 mb-1"><i class="fas fa-check mr-2 invisible" id="updateStep6"></i><?php echo _("Update complete"); ?></div>
+        <div class="ml-5 mb-3"><i class="fas fa-times mr-2 invisible" id="updateErr"></i></div>
+        <div id="errorMsg" data-message="<?php echo _("An error occurred. Check the log at <code>/tmp/raspap_install.log</code>"); ?>"></div>
       </div>
       <div class="modal-footer">
-      <button type="button" data-message="<?php echo _("Done"); ?>" class="btn btn-outline-secondary" id="cmdupdateCancel" data-dismiss="modal"><?php echo _("Cancel"); ?></button>
-      <button type="button" class="btn btn-warning" id="js-cmd-copy" /><i class="far fa-copy ml-1 mr-2"></i><?php echo _("Copy"); ?></button>
+      <button type="button" class="btn btn-outline btn-primary" data-dismiss="modal" /><?php echo _("OK"); ?></button>
       </div>
     </div>
   </div>
 </div>
+