From 9c6ea533987f1935eb54d6591133df3bd96d2523 Mon Sep 17 00:00:00 2001
From: Jur Erick <jurerick.porras@gmail.com>
Date: Tue, 25 Feb 2025 22:09:12 +0800
Subject: [PATCH] - pass page param to Contact model of /contacts handler -
 added aria attribute to archive progress ui - htmx attributes update in edit
 - add loadMore block in index page - add sweetalert script  & sweeConfirm
 function

---
 app.py                    |  6 +--
 templates/archive_ui.html | 25 ++++++-----
 templates/edit.html       | 12 ++++--
 templates/index.html      | 89 ++++++++++++++++++++++-----------------
 templates/layout.html     | 11 +++++
 templates/new.html        |  2 +-
 6 files changed, 90 insertions(+), 55 deletions(-)

diff --git a/app.py b/app.py
index 201eb47..b1a34f6 100644
--- a/app.py
+++ b/app.py
@@ -29,8 +29,8 @@ def contacts():
         if request.headers.get('HX-Trigger') == 'search':
             return render_template("rows.html", contacts=contacts_set)
     else:
-        contacts_set = Contact.all()
-    return render_template("index.html", contacts=contacts_set, archiver=Archiver.get())
+        contacts_set = Contact.all(page)
+    return render_template("index.html", contacts=contacts_set, page=page, archiver=Archiver.get())
 
 
 @app.route("/contacts/archive", methods=["POST"])
@@ -130,7 +130,7 @@ def contacts_delete_all():
         contact = Contact.find(contact_id)
         contact.delete()
     flash("Deleted Contacts!")
-    contacts_set = Contact.all(1)
+    contacts_set = Contact.all()
     return render_template("index.html", contacts=contacts_set)
 
 
diff --git a/templates/archive_ui.html b/templates/archive_ui.html
index 430d8c7..4461362 100644
--- a/templates/archive_ui.html
+++ b/templates/archive_ui.html
@@ -1,17 +1,22 @@
 <div id="archive-ui" hx-target="this" hx-swap="outerHTML">
     {% if archiver.status() == "Waiting" %}
-        <button hx-post="/contacts/archive">
-            Download Contact Archive
-        </button>
+    <button hx-post="/contacts/archive">
+        Download Contact Archive
+    </button>
     {% elif archiver.status() == "Running" %}
-        <div hx-get="/contacts/archive" hx-trigger="load delay:500ms">
-            Creating Archive...
-            <div class="progress" >
-                <div id="archive-progress" class="progress-bar" style="width:{{ archiver.progress() * 100 }}%"></div>
-            </div>
+    <div hx-get="/contacts/archive" hx-trigger="load delay:500ms">
+        Creating Archive...
+        <div class="progress">
+            <div id="archive-progress" 
+                role="progressbar" 
+                aria-valuenow="{{ archiver.progress() * 100 }}"
+                class="progress-bar" 
+                style="width:{{ archiver.progress() * 100 }}%"
+            ></div>
         </div>
+    </div>
     {% elif archiver.status() == "Complete" %}
-        <a hx-boost="false" href="/contacts/archive/file" _="on load click() me">Archive Downloading!  Click here if the download does not start.</a>
-        <button hx-delete="/contacts/archive">Clear Download</button>
+    <a hx-boost="false" href="/contacts/archive/file" _="on load click() me">Archive Ready! Click here if the download does not start.</a>
+    <button hx-delete="/contacts/archive">Clear Download</button>
     {% endif %}
 </div>
\ No newline at end of file
diff --git a/templates/edit.html b/templates/edit.html
index fd7ac84..6e16d13 100644
--- a/templates/edit.html
+++ b/templates/edit.html
@@ -10,7 +10,7 @@
                     <label for="email">Email</label>
                     <input name="email" id="email" type="email"
                            hx-get="/contacts/{{ contact.id }}/email" hx-target="next .error"
-                           hx-trigger="change, keyup delay:200ms"
+                           hx-trigger="change, keyup delay:200ms changed"
                            placeholder="Email" value="{{ contact.email }}">
                     <span class="error">{{ contact.errors['email'] }}</span>
                 </p>
@@ -37,10 +37,16 @@
     </form>
 
     <button id="delete-btn"
+            class="bad bg color border"
             hx-delete="/contacts/{{ contact.id }}"
             hx-push-url="true"
-            hx-confirm="Are you sure you want to delete this contact?"
-            hx-target="body">
+            hx-trigger="confirmed"
+            hx-target="body"
+            @click="sweetConfirm($el, {
+                title: 'Delete this contacts?',
+                showCancelButton: true,
+                confirmButtonText: 'Delete'
+            })">
         Delete Contact
     </button>
 
diff --git a/templates/index.html b/templates/index.html
index e02c400..bccd15b 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -2,61 +2,74 @@
 
 {% block content %}
 
-    {% include 'archive_ui.html' %}
+{% include 'archive_ui.html' %}
 
-    <form action="/contacts" method="get" class="tool-bar">
-        <label for="search">Search Term</label>
-        <input id="search" type="search" name="q" value="{{ request.args.get('q') or '' }}"
-               hx-get="/contacts"
-               hx-trigger="search, keyup delay:200ms changed"
-               hx-target="tbody"
-               hx-push-url="true"
-               hx-indicator="#spinner"/>
-        <img style="height: 20px" id="spinner" class="htmx-indicator" src="/static/img/spinning-circles.svg"/>
-        <input type="submit" value="Search"/>
-    </form>
+<form action="/contacts" method="get" class="tool-bar">
+    <label for="search">Search Term</label>
+    <input id="search" type="search" name="q" value="{{ request.args.get('q') or '' }}" 
+        hx-get="/contacts"
+        hx-trigger="search, keyup delay:200ms changed" 
+        hx-target="tbody" 
+        hx-push-url="true" 
+        hx-indicator="#spinner"
+        placeholder="Search Contacts" 
+        _="on keydown[altKey and code is 'KeyS'] from the window me.focus()" />
+    <img style="height: 20px" id="spinner" class="htmx-indicator" src="/static/img/spinning-circles.svg" />
+    <input type="submit" value="Search" />
+</form>
 
-    <form x-data="{ selected: [] }">
-    <template
+<form x-data="{ selected: [] }">
+    <template 
         x-if="selected.length > 0">
         <div class="box info tool-bar flxed top">
             <slot x-text="selected.length"></slot>
             contacts selected
-            
-            <button type="button" class="bad bg color border"
+
+            <button type="button" class="bad bg color border" 
                 @click="confirm(`Delete ${selected.length} contacts?`) &&
                     htmx.ajax('DELETE', '/contacts', { source: $root, target: document.body })"
             >Delete</button>
             <hr aria-orientation="vertical">
-            <button type="button" @click="selected = []">Cancel</button> 
+            <button type="button" @click="selected = []">Cancel</button>
         </div>
     </template>
     <table>
         <thead>
-        <tr>
-            <th></th>
-            <th>First</th>
-            <th>Last</th>
-            <th>Phone</th>
-            <th>Email</th>
-            <th></th>
-        </tr>
+            <tr>
+                <th></th>
+                <th>First</th>
+                <th>Last</th>
+                <th>Phone</th>
+                <th>Email</th>
+                <th></th>
+            </tr>
         </thead>
         <tbody>
-        {% include 'rows.html' %}
+            {% include 'rows.html' %}
+            {% if contacts|length == 10 %}
+            <tr>
+                <td colspan="5" style="text-align: center;">
+                    <button hx-target="closest tr" hx-swap="outerHTML" hx-select="tbody tr"
+                        hx-get="/contacts?page={{ page+1 }}">
+                        Load More
+                    </button>
+                </td>
+            </tr>
+            {% endif %}
         </tbody>
     </table>
-        <button hx-delete="/contacts"
-                hx-confirm="Are you sure you want to delete these contacts?"
-                hx-target="body">
-            Delete Selected Contacts
-        </button>
-    </form>
-    <p>
-        <a href="/contacts/new">Add Contact</a>
-        <span hx-get="/contacts/count" hx-trigger="revealed">
-          <img id="spinner" style="height: 20px"  class="htmx-indicator" src="/static/img/spinning-circles.svg"/>
-        </span>
-    </p>
+    <button hx-delete="/contacts" 
+        hx-confirm="Are you sure you want to delete these contacts?" 
+        hx-target="body">
+        Delete Selected Contacts
+    </button>
+</form>
+
+<p>
+    <a href="/contacts/new">Add Contact</a>
+    <span hx-get="/contacts/count" hx-trigger="revealed">
+        <img id="spinner" style="height: 20px" class="htmx-indicator" src="/static/img/spinning-circles.svg" />
+    </span>
+</p>
 
 {% endblock %}
\ No newline at end of file
diff --git a/templates/layout.html b/templates/layout.html
index 7300176..b375102 100644
--- a/templates/layout.html
+++ b/templates/layout.html
@@ -8,6 +8,7 @@
     <script src="/static/js/_hyperscript-0.9.7.js"></script>
     <script src="/static/js/rsjs-menu.js" type="module"></script>
     <script defer src="https://unpkg.com/alpinejs@3/dist/cdn.min.js"></script>
+    <script defer src="https://unpkg.com/sweetalert2@11.17.2/dist/sweetalert2.all.min.js"></script>
 </head>
 <body hx-boost="true">
 <main>
@@ -22,5 +23,15 @@ <h1>
     {% endfor %}
     {% block content %}{% endblock %}
 </main>
+
+<script>
+    function sweetConfirm(elt, config) {
+        Swal.fire(config).then((result) => {
+            if(result.isConfirmed) {
+                elt.dispatchEvent(new Event('confirmed'));
+            }
+        })
+    }
+</script>
 </body>
 </html>
\ No newline at end of file
diff --git a/templates/new.html b/templates/new.html
index 285d5f8..779fff9 100644
--- a/templates/new.html
+++ b/templates/new.html
@@ -8,7 +8,7 @@
         <div class="table rows">
             <p>
                 <label for="email">Email</label>
-                <input name="email" id="email" type="text" placeholder="Email" value="{{ contact.email or '' }}">
+                <input name="email" id="email" type="email" placeholder="Email" value="{{ contact.email or '' }}">
                 <span class="error">{{ contact.errors['email'] }}</span>
             </p>
             <p>