feat: Update ascii templates to be nicer

blueprints/api.py

@@ -4,7 +4,7 @@ import datetime
 import requests
 import re
 from mail import sendEmail
-from tools import getClientIP, getGitCommit, json_response, parse_date
+from tools import getClientIP, getGitCommit, json_response, parse_date, get_tools_data
 from blueprints.sol import sol_bp
 from dateutil import parser as date_parser
 
@@ -164,6 +164,21 @@ def project():
         "status": HTTP_OK
     })
 
+@api_bp.route("/tools")
+def tools():
+    """Get a list of tools used by Nathan Woodburn."""
+    try:
+        tools = get_tools_data()
+    except Exception as e:
+        print(f"Error getting tools data: {e}")
+        return json_response(request, "500 Internal Server Error", HTTP_SERVER_ERROR)
+
+    # Remove demo and move demo_url to demo
+    for tool in tools:
+        if "demo_url" in tool:
+            tool["demo"] = tool.pop("demo_url")
+        
+    return json_response(request, {"tools": tools}, HTTP_OK)
 
 @api_bp.route("/page_date")
 def page_date():

curl.py

@@ -1,5 +1,5 @@
 from flask import render_template
-from tools import error_response, getAddress
+from tools import error_response, getAddress, get_tools_data, getClientIP
 import os
 from functools import lru_cache
 import requests
@@ -81,7 +81,7 @@ def curl_response(request):
     # Handle special cases
     if path == "index":
         # Get current project
-        return render_template("index.ascii",header=get_header(),repo=get_current_project()), 200, {'Content-Type': 'text/plain; charset=utf-8'}
+        return render_template("index.ascii",repo=get_current_project(), ip=getClientIP(request)), 200, {'Content-Type': 'text/plain; charset=utf-8'}
     if path == "projects":
         # Get projects
         return render_template("projects.ascii",header=get_header(),projects=get_projects()), 200, {'Content-Type': 'text/plain; charset=utf-8'}
@@ -101,8 +101,6 @@ def curl_response(request):
                                coins=coinList
                                ), 200, {'Content-Type': 'text/plain; charset=utf-8'}        
 
-        
-                               
     # For other donation pages, fall back to ascii if it exists
     if path.startswith("donate/"):
         coin = path.split("/")[1]
@@ -110,6 +108,10 @@ def curl_response(request):
         if address != "":
             return render_template("donate_coin.ascii",header=get_header(),coin=coin.upper(),address=address), 200, {'Content-Type': 'text/plain; charset=utf-8'}
     
+    if path == "tools":
+        tools = get_tools_data()
+        return render_template("tools.ascii",header=get_header(),tools=tools), 200, {'Content-Type': 'text/plain; charset=utf-8'}
+
 
     if os.path.exists(f"templates/{path}.ascii"):
         return render_template(f"{path}.ascii",header=get_header()), 200, {'Content-Type': 'text/plain; charset=utf-8'}

data/tools.json

@@ -25,55 +25,61 @@
     },
     {
         "name": "Zellij",
-        "type": "terminal",
+        "type": "Terminal Tools",
         "url": "https://zellij.dev/",
         "description": "A terminal workspace and multiplexer"
     },
     {
         "name": "Fx",
-        "type": "terminal",
+        "type": "Terminal Tools",
         "url": "https://fx.wtf/",
         "description": "A command-line JSON viewer and processor",
-        "demo": "<script src=\"https://asciinema.c.woodburn.au/a/cx8sr8adsP6Uoi9zpg8MYnVTl.js\" id=\"asciicast-cx8sr8adsP6Uoi9zpg8MYnVTl\" async=\"true\"></script>"
+        "demo": "<script src=\"https://asciinema.c.woodburn.au/a/4.js\" id=\"asciicast-4\" async=\"true\"></script>",
+        "demo_url": "https://asciinema.c.woodburn.au/a/4"
     },
     {
         "name": "Zoxide",
-        "type": "terminal",
+        "type": "Terminal Tools",
         "url": "https://github.com/ajeetdsouza/zoxide",
         "description": "cd but with fuzzy matching and other cool features",
-        "demo": "<script src=\"https://asciinema.c.woodburn.au/a/5.js\" id=\"asciicast-5\" async=\"true\"></script>"
+        "demo": "<script src=\"https://asciinema.c.woodburn.au/a/5.js\" id=\"asciicast-5\" async=\"true\"></script>",
+        "demo_url": "https://asciinema.c.woodburn.au/a/5"
     },
     {
         "name": "Atuin",
-        "type": "terminal",
+        "type": "Terminal Tools",
         "url": "https://atuin.sh/",
         "description": "A next-generation shell history manager",
-        "demo": "<script src=\"https://asciinema.c.woodburn.au/a/6.js\" id=\"asciicast-6\" async=\"true\"></script>"
+        "demo": "<script src=\"https://asciinema.c.woodburn.au/a/6.js\" id=\"asciicast-6\" async=\"true\"></script>",
+        "demo_url": "https://asciinema.c.woodburn.au/a/6"
     },
     {
         "name": "Tmate",
-        "type": "terminal",
+        "type": "Terminal Tools",
         "url": "https://tmate.io/",
         "description": "Instant terminal sharing",
-        "demo": "<script src=\"https://asciinema.c.woodburn.au/a/7.js\" id=\"asciicast-7\" async=\"true\"></script>"
+        "demo": "<script src=\"https://asciinema.c.woodburn.au/a/7.js\" id=\"asciicast-7\" async=\"true\"></script>",
+        "demo_url": "https://asciinema.c.woodburn.au/a/7"
     },
     {
         "name": "Eza",
-        "type": "terminal",
+        "type": "Terminal Tools",
         "url": "https://eza.rocks/",
         "description": "A modern replacement for 'ls'",
-        "demo": "<script src=\"https://asciinema.c.woodburn.au/a/8.js\" id=\"asciicast-8\" async=\"true\"></script>"
+        "demo": "<script src=\"https://asciinema.c.woodburn.au/a/8.js\" id=\"asciicast-8\" async=\"true\"></script>",
+        "demo_url": "https://asciinema.c.woodburn.au/a/8"
     },
     {
         "name": "Bat",
-        "type": "terminal",
+        "type": "Terminal Tools",
         "url": "https://github.com/sharkdp/bat",
         "description": "A cat clone with syntax highlighting and Git integration",
-        "demo": "<script src=\"https://asciinema.c.woodburn.au/a/9.js\" id=\"asciicast-9\" async=\"true\"></script>"
+        "demo": "<script src=\"https://asciinema.c.woodburn.au/a/9.js\" id=\"asciicast-9\" async=\"true\"></script>",
+        "demo_url": "https://asciinema.c.woodburn.au/a/9"
     },
     {
         "name": "Oh My Zsh",
-        "type": "terminal",
+        "type": "Terminal Tools",
         "url": "https://ohmyz.sh/",
         "description": "A delightful community-driven framework for managing your Zsh configuration"
     },

server.py

@@ -685,6 +685,8 @@ def resume_pdf():
 
 @app.route("/tools")
 def tools():
+    if isCurl(request):
+        return curl_response(request)
     return render_template("tools.html", tools=get_tools_data())
 
 # endregion

templates/donate.ascii

@@ -5,9 +5,9 @@
 
 If you’d like to support my work 💙
 
-- PayPal: [https://paypal.me/nathanwoodburn]
-- GitHub: [https://github.com/sponsors/Nathanwoodburn]
-- Stripe: [https://donate.stripe.com/8wM6pv0VD08Xe408ww]
+- PayPal: https://paypal.me/nathanwoodburn
+- GitHub: https://github.com/sponsors/Nathanwoodburn
+- Stripe: https://donate.stripe.com/8wM6pv0VD08Xe408ww
 
 HNS: nathan.woodburn  
 {{ HNS }}

templates/header.ascii

@@ -7,5 +7,6 @@
 Home     [/]
 Contact  [/contact]
 Projects [/projects]
+Tools    [/tools]
 Donate   [/donate]
 

templates/index.ascii

@@ -1,4 +1,16 @@
-{{header}}
+─────────────────────────────────────────────────────
+  .  .    , .           .  .        ..             / 
+  |\ | _.-+-|_  _.._    |  | _  _  _||_ . .._.._  /  
+  | \|(_] | [ )(_][ ) * |/\|(_)(_)(_][_)(_|[  [ )/   
+─────────────────────────────────────────────────────
+
+Home     [/]
+Contact  [/contact]
+Projects [/projects]
+Tools    [/tools]
+Donate   [/donate]
+API      [/api/v1/]
+
 ───────────────────────────────────────────────
  ABOUT ME 
 ──────────
@@ -18,7 +30,7 @@ I'm currently working on: {{ repo | safe }}
 ────────
 
 - Linux servers & CLI
-- DNS, DNSSEC, and Trustless SSL
+- DNS & DNSSEC
 - NGINX web servers
 - Programming:
   - Python 3
@@ -26,3 +38,7 @@ I'm currently working on: {{ repo | safe }}
   - Java
   - Bash
 
+
+Served to: {{ ip }}
+───────────────────────────────────────────────
+

templates/index.html

@@ -105,7 +105,7 @@ Check them out here!</blockquote><img class="img-fluid" src="/assets/img/pfront.
                     <h2>Skills</h2>
                     <ul class="list-unstyled" style="font-size: 18px;">
                         <li class="programlinux">Linux Servers and CLI</li>
-                        <li>DNS, DNSSEC and Trustless SSL</li>
+                        <li>DNS and DNSSEC</li>
                         <li class="programnginx">NGINX Web Servers</li>
                         <li class="programc">Programming in<ul class="list-inline">
                                 <li class="list-inline-item">Python 3</li>
@@ -227,7 +227,7 @@ Check them out here!</blockquote><img class="img-fluid" src="/assets/img/pfront.
         <div class="container text-center">
             <div class="row">
                 <div class="col">
-                    <p>Verify me with this <a href="pgp" target="_blank">long lifetime Public Key</a> or this <a href="gitpgp" target="_blank">short term one for Github commits</a></p>
+                    <p>Verify me with this <a href="pgp" target="_blank">PGP Public Key</a></p>
                 </div>
             </div>
             <div class="row">

templates/tools.ascii

@@ -0,0 +1,20 @@
+{{header}}
+───────────────────────────────────────────────
+ Tools 
+────────────
+
+Here are some of the tools I use regularly — most of them are open source! 🛠️
+
+{% for type, tools_in_type in tools | groupby('type') %}
+{{type}}
+{% for tool in tools_in_type %}
+{{tool.name}}
+{{tool.description}}
+Website: {{tool.url}}
+{% if tool.demo_url %}Demo: {{tool.demo_url}}{% endif %}
+{% endfor %}
+
+───────────────────────────────────────────────
+{% endfor %}
+
+

tests/api.hurl

@@ -14,4 +14,7 @@ GET http://127.0.0.1:5000/api/v1/message
 HTTP 200
 GET http://127.0.0.1:5000/api/v1/project
 HTTP 200
-
+GET http://127.0.0.1:5000/api/v1/tools
+HTTP 200
+[Asserts]
+jsonpath "$.tools" count > 5