From b65154b8653942fd96e26826a39373ddc9892685 Mon Sep 17 00:00:00 2001
From: ngolp <nickgolparvar@gmail.com>
Date: Thu, 17 Oct 2024 17:56:27 -0400
Subject: [PATCH 1/3] Basic implementation of searching by email. I'd like to
 expand this to searching by other column values as well if necessary, and I
 still need to add sorting. Also, "registered users" isn't perfectly centered
 (its pushed off just a bit by the search button). This commit is mainly so I
 can save my progress.

---
 goathacks/templates/admin.html | 43 +++++++++++++++++++++++++++++++++-
 1 file changed, 42 insertions(+), 1 deletion(-)

diff --git a/goathacks/templates/admin.html b/goathacks/templates/admin.html
index 410c36a..07a0073 100644
--- a/goathacks/templates/admin.html
+++ b/goathacks/templates/admin.html
@@ -14,7 +14,21 @@
 {% block app_content %}
 <div class="card text-center">
     <div class="card-body">
-        <h1 class="h3 mb-3 fw-normal">Registered Users</h1>
+
+        <div style="display:flex;flex-wrap:nowrap;align-items:center;">
+            <div class="dropdown">
+                <a href="#" class="btn btn-primary dropdown-toggle"
+                            data-bs-toggle="dropdown">Search<span
+                            class="caret"></span></a>
+                <ul class="dropdown-menu">
+                    <input style="padding:5px;margin-left:10px;margin-right:10px;" type="text" id="searchbox" name="searchbox_text" placeholder="Search By Email" onkeyup="filterHackers()"/>
+                </ul>
+            </div>
+
+            <!-- TODO: get "Registered Users" properly centered -->
+            <h1 style="flex-grow:1;justify-content:center;" class="h3 mb-3 fw-normal">Registered Users</h1>
+        </div>
+
         <table id="hackers" class="table table-striped">
             <thead>
                 <tr>
@@ -90,5 +104,32 @@
         </table>
     </div>
 </div>
+
+<script type="text/javascript">
+    function filterHackers() {
+        const input = document.getElementById("searchbox").value.toLowerCase();
+        const hackertable = document.getElementById("hackers");
+        let rows = hackertable.getElementsByTagName("tr");
+
+        //iterate over all rows
+        for(let i = 1; i < rows.length; i++) {
+            //get the email
+            const cells = rows[i].getElementsByTagName("td");
+            const emailCell = cells[6];
+
+            //if there is an email, display or dont display based on searchbox
+            if(emailCell) {
+                const emailText = emailCell.textContent.toLowerCase();
+                if(!emailText.includes(input)) {
+                    rows[i].style.display = "none";
+                }
+                else {
+                    rows[i].style.display = "";
+                }
+            }
+        }
+    }
+
+</script>
 {% endblock %}
 
-- 
2.43.5


From 228244ad2dec4c302cb33f40a53a548eb459fa3c Mon Sep 17 00:00:00 2001
From: ngolp <nickgolparvar@gmail.com>
Date: Sun, 27 Oct 2024 12:28:10 -0400
Subject: [PATCH 2/3] Hacker table on admin dashboard can now be sorted by
 double clicking the headers. Spent a bit trying to implement this manually
 before learning about the sortable class. The more you know!

---
 goathacks/templates/admin.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/goathacks/templates/admin.html b/goathacks/templates/admin.html
index 07a0073..ff5a99b 100644
--- a/goathacks/templates/admin.html
+++ b/goathacks/templates/admin.html
@@ -29,7 +29,7 @@
             <h1 style="flex-grow:1;justify-content:center;" class="h3 mb-3 fw-normal">Registered Users</h1>
         </div>
 
-        <table id="hackers" class="table table-striped">
+        <table id="hackers" class="table table-striped sortable">
             <thead>
                 <tr>
                     <th>Options</th>
@@ -107,6 +107,7 @@
 
 <script type="text/javascript">
     function filterHackers() {
+        //get hacker table and searchbox info
         const input = document.getElementById("searchbox").value.toLowerCase();
         const hackertable = document.getElementById("hackers");
         let rows = hackertable.getElementsByTagName("tr");
@@ -129,7 +130,6 @@
             }
         }
     }
-
 </script>
 {% endblock %}
 
-- 
2.43.5


From 4e2427491552c04d945549fb78a53e3211ecf28a Mon Sep 17 00:00:00 2001
From: ngolp <nickgolparvar@gmail.com>
Date: Thu, 31 Oct 2024 13:41:12 -0400
Subject: [PATCH 3/3] basic implementation of github issue #28 (modifying user
 details right from admin dashboard). Went with first name, last name, school,
 and phone number, since the user can change the shirt size and special
 accomodations on their own.

---
 goathacks/admin/__init__.py    | 40 ++++++++++++++++++++++++++++++++++
 goathacks/templates/admin.html | 36 ++++++++++++++++++++++++++----
 2 files changed, 72 insertions(+), 4 deletions(-)

diff --git a/goathacks/admin/__init__.py b/goathacks/admin/__init__.py
index 08ddf33..ebecfc8 100644
--- a/goathacks/admin/__init__.py
+++ b/goathacks/admin/__init__.py
@@ -4,6 +4,8 @@ from flask_mail import Message
 
 from goathacks.models import User
 
+from sqlalchemy.exc import IntegrityError
+
 bp = Blueprint("admin", __name__, url_prefix="/admin")
 
 from goathacks import db, mail as app_mail
@@ -221,6 +223,44 @@ def hackers():
     users = User.query.all()
     return User.create_json_output(users)
 
+@bp.route("/updateHacker", methods=["POST"])
+@login_required
+def updateHacker():
+    if not current_user.is_admin:
+        return redirect(url_for("dashboard.home"))
+    
+    # get params from json
+    hacker_id = request.json['hacker_id']
+    change_field = request.json['change_field']
+    new_val = request.json['new_val']
+
+    # find the user in db
+    user = User.query.filter_by(id=hacker_id).one()
+    if user is None:
+        return {"status": "error", "msg": "user not found"}
+    
+
+    # update the hacker depending on change_field
+    match change_field:
+        case "first_name":
+            user.first_name = new_val
+        case "last_name":
+            user.last_name = new_val
+        case "school":
+            user.school = new_val
+        case "phone":
+            user.phone = new_val
+
+    try:
+        db.session.commit()
+    except IntegrityError as err:
+        db.session.rollback()
+        flash("Could not update user information for user " + hacker_id)
+        return {"status": "error"}
+
+        
+    return {"status": "success"}
+
 import json
 import csv
 from io import StringIO
diff --git a/goathacks/templates/admin.html b/goathacks/templates/admin.html
index ff5a99b..a5ef1fd 100644
--- a/goathacks/templates/admin.html
+++ b/goathacks/templates/admin.html
@@ -21,7 +21,7 @@
                             data-bs-toggle="dropdown">Search<span
                             class="caret"></span></a>
                 <ul class="dropdown-menu">
-                    <input style="padding:5px;margin-left:10px;margin-right:10px;" type="text" id="searchbox" name="searchbox_text" placeholder="Search By Email" onkeyup="filterHackers()"/>
+                    <input style="padding:5px;margin-left:10px;margin-right:10px;" type="text" id="searchbox" name="searchbox-text" placeholder="Search By Email" onkeyup="filterHackers()"/>
                 </ul>
             </div>
 
@@ -93,11 +93,20 @@
                     <td>{{ hacker.id }}</td>
                     <td>{{ hacker.last_login }}</td>
                     <td>{{ hacker.email }}</td>
-                    <td>{{ hacker.first_name + ' ' + hacker.last_name }}</td>
-                    <td>{{ hacker.phone }}</td>
+                    <td>
+                        <div style="display: flex; justify-content: flex-start;">
+                            <input style="padding:5px; margin-left:10px; margin-right:10px;width:fit-content;max-width:100px;" type="text" id="{{hacker.id}}-namebox-first" placeholder="first_name" value="{{hacker.first_name}}" onchange="updateHacker(this.id, 'first_name', this.value)"/>
+                            <input style="padding:5px; margin-left:10px; margin-right:10px;width:fit-content;max-width:100px;" type="text" id="{{hacker.id}}-namebox-last" placeholder="last_name" value="{{hacker.last_name}}" onchange="updateHacker(this.id, 'last_name', this.value)"/>
+                        </div>
+                    </td>
+                    <td>
+                        <input style="padding:5px; margin-left:10px; margin-right:10px;width:fit-content;max-width:100px;" type="text" id="{{hacker.id}}-phonebox" placeholder="phone" value="{{hacker.phone}}" onchange="updateHacker(this.id, 'phone', this.value)"/>
+                    </td>
                     <td>{{ hacker.shirt_size }}</td>
                     <td>{{ hacker.accomodations }}</td>
-                    <td>{{ hacker.school }}</td>
+                    <td>
+                        <input style="padding:5px; margin-left:10px; margin-right:10px;width:fit-content;max-width:75px;" type="text" id="{{hacker.id}}-schoolbox" placeholder="school" value="{{hacker.school}}" onchange="updateHacker(this.id, 'school', this.value)"/>
+                    </td>
                 </tr>
                 {% endfor %}
             </tbody>
@@ -130,6 +139,25 @@
             }
         }
     }
+
+    function updateHacker(id, change_field, new_val) {
+        //tell backend to update a specific field for a hacker
+        const headers = [
+            ["Content-Type", "application/json"],
+        ];
+
+        let body = {
+            "hacker_id": id.substr(0, id.indexOf('-')),
+            "change_field": change_field,
+            "new_val": new_val,
+        }
+
+        //send the post request, and report the error if there is one
+        fetch('/admin/updateHacker', {method: 'POST', body: JSON.stringify(body), headers: headers}).catch((err) => {
+            window.alert("Error updating user - see console for details");
+            console.log(err);
+        })
+    }
 </script>
 {% endblock %}
 
-- 
2.43.5