From 95a5c95842de869cfd7c8e9d1c824dc0780af949 Mon Sep 17 00:00:00 2001
From: jwansek <eddie.atten.ea29@gmail.com>
Date: Wed, 22 Dec 2021 19:35:12 +0000
Subject: renamed all template files

---
 templates/discord.html   |   5 ---
 templates/discord.jinja  |   5 +++
 templates/index.html     |  37 ----------------
 templates/index.jinja    |  37 ++++++++++++++++
 templates/nhdl.html      |   8 ----
 templates/nhdl.jinja     |   8 ++++
 templates/random.html    |  22 ---------
 templates/random.jinja   |  22 +++++++++
 templates/services.html  | 113 -----------------------------------------------
 templates/services.jinja | 113 +++++++++++++++++++++++++++++++++++++++++++++++
 templates/template.html  |  80 ---------------------------------
 templates/template.jinja |  80 +++++++++++++++++++++++++++++++++
 templates/thoughts.html  |  12 -----
 templates/thoughts.jinja |  12 +++++
 14 files changed, 277 insertions(+), 277 deletions(-)
 delete mode 100644 templates/discord.html
 create mode 100644 templates/discord.jinja
 delete mode 100644 templates/index.html
 create mode 100644 templates/index.jinja
 delete mode 100644 templates/nhdl.html
 create mode 100644 templates/nhdl.jinja
 delete mode 100644 templates/random.html
 create mode 100644 templates/random.jinja
 delete mode 100644 templates/services.html
 create mode 100644 templates/services.jinja
 delete mode 100644 templates/template.html
 create mode 100644 templates/template.jinja
 delete mode 100644 templates/thoughts.html
 create mode 100644 templates/thoughts.jinja

(limited to 'templates')

diff --git a/templates/discord.html b/templates/discord.html
deleted file mode 100644
index b4504a2..0000000
--- a/templates/discord.html
+++ /dev/null
@@ -1,5 +0,0 @@
-{% extends "template.html" %}
-{% block content %}
-   <p>You can contact me on discord (telegram preferred):</p>
-   <h1>{{discord}}</h1>
- {% endblock %}
\ No newline at end of file
diff --git a/templates/discord.jinja b/templates/discord.jinja
new file mode 100644
index 0000000..b4504a2
--- /dev/null
+++ b/templates/discord.jinja
@@ -0,0 +1,5 @@
+{% extends "template.html" %}
+{% block content %}
+   <p>You can contact me on discord (telegram preferred):</p>
+   <h1>{{discord}}</h1>
+ {% endblock %}
\ No newline at end of file
diff --git a/templates/index.html b/templates/index.html
deleted file mode 100644
index 07488fe..0000000
--- a/templates/index.html
+++ /dev/null
@@ -1,37 +0,0 @@
-{% extends "template.html" %}
-{% block content %}
-    <aside>
-        <section id="recent_thoughts">
-            <h4>recent thoughts:</h4>
-            <ul>
-                {% for id_, title in featured_thoughts %}
-                    <li><a href="{{'/thought?id=%i' % id_}}">{{title}}</a></li>
-                {% endfor %}
-            </ul>
-        </section>
-    </aside>
-    {{markdown|safe}}
-    {% if tweets != None %}
-        <section id="recent_tweets">
-            <h3>recent tweets</h3>
-            <ul>
-                {% for text, url in tweets %}
-                    {% if text == None %}
-                        <li><a href="{{url}}">[image only]</a></li>
-                    {% else %}
-                        <li><a href="{{url}}">{{text}}</a></li>
-                    {% endif %}
-                {% endfor %}
-            </ul>
-        </section>
-    {% endif %}
-    <section id="recent_commits">
-        <h3>recent git commits:</h3>
-        <ul>
-            {% for commit in commits %}
-                <!-- <li><a href="{{commit['url']}}">{{"[%s] %s {+%i;-%i}" % (commit["repo"], commit["message"], commit["stats"]["additions"], commit["stats"]["deletions"])}}</a></li> -->
-                <li>[<a href="{{https://git.eda.gay + commit['repo']}}">{{commit["repo"]}}</a>] {+{{commit["stats"]["additions"]}}; -{{commit["stats"]["deletions"])}}} <a href="{{commit['url'].replace('github.com', 'git.eda.gay') + '.html'}}">{{commit["message"]}}</a> - <a href="{{commit['url']}}">Backup link</a></li>
-            {% endfor %}
-        </ul>
-    </section>
-{% endblock %}
\ No newline at end of file
diff --git a/templates/index.jinja b/templates/index.jinja
new file mode 100644
index 0000000..0bb9604
--- /dev/null
+++ b/templates/index.jinja
@@ -0,0 +1,37 @@
+{% extends "template.html" %}
+{% block content %}
+    <aside>
+        <section id="recent_thoughts">
+            <h4>recent thoughts:</h4>
+            <ul>
+                {% for id_, title in featured_thoughts %}
+                    <li><a href="{{'/thought?id=%i' % id_}}">{{title}}</a></li>
+                {% endfor %}
+            </ul>
+        </section>
+    </aside>
+    {{markdown|safe}}
+    {% if tweets != None %}
+        <section id="recent_tweets">
+            <h3>recent tweets</h3>
+            <ul>
+                {% for text, url in tweets %}
+                    {% if text == None %}
+                        <li><a href="{{url}}">[image only]</a></li>
+                    {% else %}
+                        <li><a href="{{url}}">{{text}}</a></li>
+                    {% endif %}
+                {% endfor %}
+            </ul>
+        </section>
+    {% endif %}
+    <section id="recent_commits">
+        <h3>recent git commits:</h3>
+        <ul>
+            {% for commit in commits %}
+                <li><a href="{{commit['url']}}">{{"[%s] %s {+%i;-%i}" % (commit["repo"], commit["message"], commit["stats"]["additions"], commit["stats"]["deletions"])}}</a></li>
+                <!-- <li>[<a href="{{https://git.eda.gay + commit['repo']}}">{{commit["repo"]}}</a>] {+{{commit["stats"]["additions"]}}; -{{commit["stats"]["deletions"])}}} <a href="{{commit['url'].replace('github.com', 'git.eda.gay') + '.html'}}">{{commit["message"]}}</a> - <a href="{{commit['url']}}">Backup link</a></li> -->
+            {% endfor %}
+        </ul>
+    </section>
+{% endblock %}
\ No newline at end of file
diff --git a/templates/nhdl.html b/templates/nhdl.html
deleted file mode 100644
index 6702113..0000000
--- a/templates/nhdl.html
+++ /dev/null
@@ -1,8 +0,0 @@
-{% extends "template.html" %}
-{% block content %}
-    <form action="/nhdlredirect" method="POST">
-        <label for="nhentai">nHentai.net number:</label>
-        <input type="text" id="number_input" name="number_input"><br><br>
-        <input type="submit" value="Download">
-    </form>
-{% endblock %}
\ No newline at end of file
diff --git a/templates/nhdl.jinja b/templates/nhdl.jinja
new file mode 100644
index 0000000..6702113
--- /dev/null
+++ b/templates/nhdl.jinja
@@ -0,0 +1,8 @@
+{% extends "template.html" %}
+{% block content %}
+    <form action="/nhdlredirect" method="POST">
+        <label for="nhentai">nHentai.net number:</label>
+        <input type="text" id="number_input" name="number_input"><br><br>
+        <input type="submit" value="Download">
+    </form>
+{% endblock %}
\ No newline at end of file
diff --git a/templates/random.html b/templates/random.html
deleted file mode 100644
index b6e7f64..0000000
--- a/templates/random.html
+++ /dev/null
@@ -1,22 +0,0 @@
-{% extends "template.html" %}
-{% block content %}
-    <aside id="tags">
-        <h1>current search tags: (click to remove)</h1>
-        <ul>
-            {% for tag in sbi.searchTags %}
-            <li><a href={{"/random?tags=" + "+".join(sbi.remove_tag(tag))}}>{{tag}}</a></li>
-            {% endfor %}
-        </ul>
-        <h1>this image's tags:</h1>
-        <ul>
-            {% for tag in sbi.tags %}
-                <li><a href={{"/random?tags=" + "+".join(sbi.searchTags + [tag])}}>{{tag}}</a></li>
-            {% endfor %}
-        </ul>
-    </aside>
-    <section id="randomImage">
-        <a href={{sbi.source}}><img src={{localimg}}></a>
-        <h1><a href={{"/random?tags=" + "+".join(sbi.searchTags)}}>generate another</a></h1>
-        <h2><a href={{sbi.source}}>artist link</a></h2>
-    </section>
-{% endblock %}
\ No newline at end of file
diff --git a/templates/random.jinja b/templates/random.jinja
new file mode 100644
index 0000000..b6e7f64
--- /dev/null
+++ b/templates/random.jinja
@@ -0,0 +1,22 @@
+{% extends "template.html" %}
+{% block content %}
+    <aside id="tags">
+        <h1>current search tags: (click to remove)</h1>
+        <ul>
+            {% for tag in sbi.searchTags %}
+            <li><a href={{"/random?tags=" + "+".join(sbi.remove_tag(tag))}}>{{tag}}</a></li>
+            {% endfor %}
+        </ul>
+        <h1>this image's tags:</h1>
+        <ul>
+            {% for tag in sbi.tags %}
+                <li><a href={{"/random?tags=" + "+".join(sbi.searchTags + [tag])}}>{{tag}}</a></li>
+            {% endfor %}
+        </ul>
+    </aside>
+    <section id="randomImage">
+        <a href={{sbi.source}}><img src={{localimg}}></a>
+        <h1><a href={{"/random?tags=" + "+".join(sbi.searchTags)}}>generate another</a></h1>
+        <h2><a href={{sbi.source}}>artist link</a></h2>
+    </section>
+{% endblock %}
\ No newline at end of file
diff --git a/templates/services.html b/templates/services.html
deleted file mode 100644
index 9ea1d3f..0000000
--- a/templates/services.html
+++ /dev/null
@@ -1,113 +0,0 @@
-{% extends "template.html" %}
-{% block content %}
-<article id=statusTables>
-    <section id=docker>
-        <h2>docker</h2>
-        {% if docker == None %}
-            <p>Couldn't access the docker API. Is sherpa running?</p>
-        {% else %}
-            <table>
-                {% for name, status in docker.items() %}
-                    <tr>
-                        <td>{{name}}</td>
-                        {% if status == "running" %}
-                            <td class=running>{{status}}</td>
-                        {% else %}
-                            <td class=notRunning>{{status}}</td>
-                        {% endif %}
-                    </tr>
-                {% endfor %}
-            </table>
-        {% endif %}
-    </section>
-    <section id="torrents">
-        <h2>qbittorrent</h2>
-        {% if qbit == None %}
-            <p>Couldn't access the qbittorrent API. Is docker container running?</p>
-        {% else %}
-            <table>
-                <tr>
-                    <td>downloaded</td>
-                    <td>{{qbit["bytes_dl"]}}</td>
-                </tr>
-                <tr>
-                    <td>uploaded</td>
-                    <td>{{qbit["bytes_up"]}}</td>
-                </tr>
-                <tr>
-                    <td>torrents</td>
-                    <td>{{qbit["num"]}}</td>
-                </tr>
-                <tr>
-                    <td>ratio</td>
-                    <td>{{qbit["ratio"]}}</td>
-                </tr>
-            </table>
-        {% endif %}
-        <h2>transmission</h2>
-        {% if trans == None %}
-            <p>Couldn't access the transmission API. Is docker container running?</p>
-        {% else %}
-            <table>
-                <tr>
-                    <td>downloaded</td>
-                    <td>{{trans["bytes_dl"]}}</td>
-                </tr>
-                <tr>
-                    <td>uploaded</td>
-                    <td>{{trans["bytes_up"]}}</td>
-                </tr>
-                <tr>
-                    <td>torrents</td>
-                    <td>{{trans["num"]}}</td>
-                </tr>
-                <tr>
-                    <td>ratio</td>
-                    <td>{{trans["ratio"]}}</td>
-                </tr>
-            </table>
-        {% endif %}
-    </section>
-    <section id=pihole>
-        <h2>pihole</h2>
-        {% if pihole == None %}
-            <p>Couldn't access the pihole API. Is docker container running?</p>
-        {% else %}
-            <table>
-                <tr>
-                    <td>status</td>
-                    {% if pihole["status"] == "enabled" %}
-                        <td class=running>{{pihole["status"]}}</td>
-                    {% else %}
-                        <td class=notRunning>{{pihole["status"]}}</td>
-                    {% endif %}
-                </tr>
-                <tr>
-                    <td>queries</td>
-                    <td>{{pihole["queries"]}}</td>
-                </tr>
-                <tr>
-                    <td>clients</td>
-                    <td>{{pihole["clients"]}}</td>
-                </tr>
-                <tr>
-                    <td>percentage blocked</td>
-                    <td>{{pihole["percentage"]}}%</td>
-                </tr>
-                <tr>
-                    <td>blocked requests</td>
-                    <td>{{pihole["blocked"]}}</td>
-                </tr>
-                <tr>
-                    <td>domains in blocklist</td>
-                    <td>{{pihole["domains"]}}</td>
-                </tr>
-                <tr>
-                    <td>last updated</td>
-                    <td>{{pihole["last_updated"]}}</td>
-                </tr>
-            </table>
-        {% endif %}
-    </section>
-</article>
-{% endblock %}
\ No newline at end of file
diff --git a/templates/services.jinja b/templates/services.jinja
new file mode 100644
index 0000000..9ea1d3f
--- /dev/null
+++ b/templates/services.jinja
@@ -0,0 +1,113 @@
+{% extends "template.html" %}
+{% block content %}
+<article id=statusTables>
+    <section id=docker>
+        <h2>docker</h2>
+        {% if docker == None %}
+            <p>Couldn't access the docker API. Is sherpa running?</p>
+        {% else %}
+            <table>
+                {% for name, status in docker.items() %}
+                    <tr>
+                        <td>{{name}}</td>
+                        {% if status == "running" %}
+                            <td class=running>{{status}}</td>
+                        {% else %}
+                            <td class=notRunning>{{status}}</td>
+                        {% endif %}
+                    </tr>
+                {% endfor %}
+            </table>
+        {% endif %}
+    </section>
+    <section id="torrents">
+        <h2>qbittorrent</h2>
+        {% if qbit == None %}
+            <p>Couldn't access the qbittorrent API. Is docker container running?</p>
+        {% else %}
+            <table>
+                <tr>
+                    <td>downloaded</td>
+                    <td>{{qbit["bytes_dl"]}}</td>
+                </tr>
+                <tr>
+                    <td>uploaded</td>
+                    <td>{{qbit["bytes_up"]}}</td>
+                </tr>
+                <tr>
+                    <td>torrents</td>
+                    <td>{{qbit["num"]}}</td>
+                </tr>
+                <tr>
+                    <td>ratio</td>
+                    <td>{{qbit["ratio"]}}</td>
+                </tr>
+            </table>
+        {% endif %}
+        <h2>transmission</h2>
+        {% if trans == None %}
+            <p>Couldn't access the transmission API. Is docker container running?</p>
+        {% else %}
+            <table>
+                <tr>
+                    <td>downloaded</td>
+                    <td>{{trans["bytes_dl"]}}</td>
+                </tr>
+                <tr>
+                    <td>uploaded</td>
+                    <td>{{trans["bytes_up"]}}</td>
+                </tr>
+                <tr>
+                    <td>torrents</td>
+                    <td>{{trans["num"]}}</td>
+                </tr>
+                <tr>
+                    <td>ratio</td>
+                    <td>{{trans["ratio"]}}</td>
+                </tr>
+            </table>
+        {% endif %}
+    </section>
+    <section id=pihole>
+        <h2>pihole</h2>
+        {% if pihole == None %}
+            <p>Couldn't access the pihole API. Is docker container running?</p>
+        {% else %}
+            <table>
+                <tr>
+                    <td>status</td>
+                    {% if pihole["status"] == "enabled" %}
+                        <td class=running>{{pihole["status"]}}</td>
+                    {% else %}
+                        <td class=notRunning>{{pihole["status"]}}</td>
+                    {% endif %}
+                </tr>
+                <tr>
+                    <td>queries</td>
+                    <td>{{pihole["queries"]}}</td>
+                </tr>
+                <tr>
+                    <td>clients</td>
+                    <td>{{pihole["clients"]}}</td>
+                </tr>
+                <tr>
+                    <td>percentage blocked</td>
+                    <td>{{pihole["percentage"]}}%</td>
+                </tr>
+                <tr>
+                    <td>blocked requests</td>
+                    <td>{{pihole["blocked"]}}</td>
+                </tr>
+                <tr>
+                    <td>domains in blocklist</td>
+                    <td>{{pihole["domains"]}}</td>
+                </tr>
+                <tr>
+                    <td>last updated</td>
+                    <td>{{pihole["last_updated"]}}</td>
+                </tr>
+            </table>
+        {% endif %}
+    </section>
+</article>
+{% endblock %}
\ No newline at end of file
diff --git a/templates/template.html b/templates/template.html
deleted file mode 100644
index 77bf38c..0000000
--- a/templates/template.html
+++ /dev/null
@@ -1,80 +0,0 @@
-<!doctype html>
-<html lang="en">
-    <head>
-        <meta name="abuseipdb-verification" content="3IuG6dik" />
-        <link rel='stylesheet' href="{{url_for('static', filename='style.css')}}">
-        <link rel="shortcut icon" href="/img/greenboi.jpg?h=16&w=16">
-        <title>eda.gay :: {{title}}</title>
-    </head>
-    <body>
-        <div id=wrapper>
-            <header>
-                <div id="externallinks">
-                    <nav>
-                        <ul>
-                            {% for name, link in links %}
-                            <li>
-                                <a href="{{link}}">{{name}}</a>
-                            </li>
-                            {% endfor %}
-                        </ul>
-                    </nav>
-                </div>         
-                <div id=headerflex>
-                    <div id=headers>
-                        <a href="/" id=TheTitle><h1>{{title}}</h1></a>
-                        <nav id=articles>
-                            <ul>
-                                {% for name, link in articles %}
-                                <li>
-                                    <a href="{{link}}">{{name}}</a>
-                                </li>
-                                {% endfor %}
-                            </ul>
-                        </nav>
-                    </div>
-                    <a href="/">
-                        <img alt="{{image[0]}}" src="{{image[1]}}">
-                    </a>         
-                </div>
-            </header>
-            <!-- yes, this is stupid asf, using another template would be better (i cant get that to work) -->
-            {% if thought %}
-                <aside>
-                    <h4>{{dt}}</h4>
-                    <h5>this category:</h5>
-                    <ul>
-                        <li><b><a href="{{'/thoughts#'+category.replace(' ', '_')}}">{{category}}</a></b></li>
-                    </ul>
-                    <h5>related thoughts:</h5>
-                    <ul>
-                        {% for id_, title, dt, category in related %}
-                            <li><a href="{{'/thought?id=%i' % id_}}">{{title}}</a></li>
-                        {% endfor %}
-                    </ul>
-                    <h5>other categories:</h5>
-                    {% for category_name in othercategories %}
-                        <ul>
-                            <li><a href="{{'/thoughts#'+category_name.replace(' ', '_')}}">{{category_name}}</a></li>
-                        </ul>
-                    {% endfor %}
-                </aside>
-            {% endif %}
-            <div id="content">
-                {% block content %}
-                {% endblock %}
-            </div>
-            <footer>
-                <p>this site is <a href="/thought?id=3">javascript free</a></p>
-                <a href="https://github.com/jwansek/edaweb">sauce code released under gplv3</a>
-                <p>
-                    <a href="http://jigsaw.w3.org/css-validator/check/referer">
-                        <img style="border:0;width:88px;height:31px"
-                            src="/img/vcss-blue.gif"
-                            alt="Valid CSS!" />
-                    </a>
-                </p>
-            </footer>
-        </div>
-    </body>
-</html>
diff --git a/templates/template.jinja b/templates/template.jinja
new file mode 100644
index 0000000..77bf38c
--- /dev/null
+++ b/templates/template.jinja
@@ -0,0 +1,80 @@
+<!doctype html>
+<html lang="en">
+    <head>
+        <meta name="abuseipdb-verification" content="3IuG6dik" />
+        <link rel='stylesheet' href="{{url_for('static', filename='style.css')}}">
+        <link rel="shortcut icon" href="/img/greenboi.jpg?h=16&w=16">
+        <title>eda.gay :: {{title}}</title>
+    </head>
+    <body>
+        <div id=wrapper>
+            <header>
+                <div id="externallinks">
+                    <nav>
+                        <ul>
+                            {% for name, link in links %}
+                            <li>
+                                <a href="{{link}}">{{name}}</a>
+                            </li>
+                            {% endfor %}
+                        </ul>
+                    </nav>
+                </div>         
+                <div id=headerflex>
+                    <div id=headers>
+                        <a href="/" id=TheTitle><h1>{{title}}</h1></a>
+                        <nav id=articles>
+                            <ul>
+                                {% for name, link in articles %}
+                                <li>
+                                    <a href="{{link}}">{{name}}</a>
+                                </li>
+                                {% endfor %}
+                            </ul>
+                        </nav>
+                    </div>
+                    <a href="/">
+                        <img alt="{{image[0]}}" src="{{image[1]}}">
+                    </a>         
+                </div>
+            </header>
+            <!-- yes, this is stupid asf, using another template would be better (i cant get that to work) -->
+            {% if thought %}
+                <aside>
+                    <h4>{{dt}}</h4>
+                    <h5>this category:</h5>
+                    <ul>
+                        <li><b><a href="{{'/thoughts#'+category.replace(' ', '_')}}">{{category}}</a></b></li>
+                    </ul>
+                    <h5>related thoughts:</h5>
+                    <ul>
+                        {% for id_, title, dt, category in related %}
+                            <li><a href="{{'/thought?id=%i' % id_}}">{{title}}</a></li>
+                        {% endfor %}
+                    </ul>
+                    <h5>other categories:</h5>
+                    {% for category_name in othercategories %}
+                        <ul>
+                            <li><a href="{{'/thoughts#'+category_name.replace(' ', '_')}}">{{category_name}}</a></li>
+                        </ul>
+                    {% endfor %}
+                </aside>
+            {% endif %}
+            <div id="content">
+                {% block content %}
+                {% endblock %}
+            </div>
+            <footer>
+                <p>this site is <a href="/thought?id=3">javascript free</a></p>
+                <a href="https://github.com/jwansek/edaweb">sauce code released under gplv3</a>
+                <p>
+                    <a href="http://jigsaw.w3.org/css-validator/check/referer">
+                        <img style="border:0;width:88px;height:31px"
+                            src="/img/vcss-blue.gif"
+                            alt="Valid CSS!" />
+                    </a>
+                </p>
+            </footer>
+        </div>
+    </body>
+</html>
diff --git a/templates/thoughts.html b/templates/thoughts.html
deleted file mode 100644
index bdbe854..0000000
--- a/templates/thoughts.html
+++ /dev/null
@@ -1,12 +0,0 @@
-{% extends "template.html" %}
-{% block content %}
-    {% for category_name, thoughts in tree.items() %}
-        <h3 id="{{category_name.replace(' ', '_')}}">{{category_name}}</h3>
-        <dl>
-            {% for id_, title, dt in thoughts %}
-                <dt><a href="{{'/thought?id=%i' % id_}}">{{title}}</a></dt>
-                <dd>{{dt}}</dd>
-            {% endfor %}
-        </dl>
-    {% endfor %}
-{% endblock %}
\ No newline at end of file
diff --git a/templates/thoughts.jinja b/templates/thoughts.jinja
new file mode 100644
index 0000000..bdbe854
--- /dev/null
+++ b/templates/thoughts.jinja
@@ -0,0 +1,12 @@
+{% extends "template.html" %}
+{% block content %}
+    {% for category_name, thoughts in tree.items() %}
+        <h3 id="{{category_name.replace(' ', '_')}}">{{category_name}}</h3>
+        <dl>
+            {% for id_, title, dt in thoughts %}
+                <dt><a href="{{'/thought?id=%i' % id_}}">{{title}}</a></dt>
+                <dd>{{dt}}</dd>
+            {% endfor %}
+        </dl>
+    {% endfor %}
+{% endblock %}
\ No newline at end of file
-- 
cgit v1.2.3