From 70afb94d3b985e314ff1f922294875e43c56fefc Mon Sep 17 00:00:00 2001
From: rubenwardy <rw@rubenwardy.com>
Date: Sat, 2 Jun 2018 18:22:57 +0100
Subject: Add topics todo list based on forum parser

---
 app/templates/admin/list.html              |  1 +
 app/templates/todo.html                    | 54 --------------------------
 app/templates/todo/list.html               | 62 ++++++++++++++++++++++++++++++
 app/templates/todo/topics.html             | 34 ++++++++++++++++
 app/templates/users/user_profile_page.html | 23 +++++++++++
 5 files changed, 120 insertions(+), 54 deletions(-)
 delete mode 100644 app/templates/todo.html
 create mode 100644 app/templates/todo/list.html
 create mode 100644 app/templates/todo/topics.html

(limited to 'app/templates')

diff --git a/app/templates/admin/list.html b/app/templates/admin/list.html
index ff422ba..e5049f9 100644
--- a/app/templates/admin/list.html
+++ b/app/templates/admin/list.html
@@ -18,6 +18,7 @@
 			<input type="hidden" name="csrf_token" value="{{ csrf_token() }}" />
 			<select name="action">
 				<option value="importusers">Create users from mod list</option>
+				<option value="importmodlist">Import Krock's mod list</option>
 				<option value="importscreenshots" selected>Import screenshots from VCS</option>
 				<option value="importdepends">Import dependencies from downloads</option>
 				<option value="modprovides">Set provides to mod name</option>
diff --git a/app/templates/todo.html b/app/templates/todo.html
deleted file mode 100644
index b20f26c..0000000
--- a/app/templates/todo.html
+++ /dev/null
@@ -1,54 +0,0 @@
-{% extends "base.html" %}
-
-{% block title %}
-{{ title }}
-{% endblock %}
-
-{% block content %}
-	{% if canApproveNew %}
-		<h2>Packages Awaiting Approval</h2>
-		<ul>
-			{% for p in packages %}
-				<li><a href="{{ p.getDetailsURL() }}">
-					{{ p.title }} by {{ p.author.display_name }}
-				</a></li>
-			{% else %}
-				<li><i>No packages need reviewing.</i></ul>
-			{% endfor %}
-		</ul>
-	{% endif %}
-
-	{% if canApproveScn %}
-		<h2>Screenshots Awaiting Approval</h2>
-		<ul>
-			{% for s in screenshots %}
-				<li>
-					<a href="{{ s.getEditURL() }}">{{ s.title }}</a>
-					on
-					<a href="{{ s.package.getDetailsURL() }}">
-						{{ s.package.title }} by {{ s.package.author.display_name }}
-					</a>
-				</li>
-			{% else %}
-				<li><i>No screenshots need reviewing.</i></ul>
-			{% endfor %}
-		</ul>
-	{% endif %}
-
-	{% if canApproveRel %}
-		<h2>Releases Awaiting Approval</h2>
-		<ul>
-			{% for r in releases %}
-				<li>
-					<a href="{{ r.getEditURL() }}">{{ r.title }}</a>
-					on
-					<a href="{{ r.package.getDetailsURL() }}">
-						{{ r.package.title }} by {{ r.package.author.display_name }}
-					</a>
-				</li>
-			{% else %}
-				<li><i>No releases need reviewing.</i></ul>
-			{% endfor %}
-		</ul>
-	{% endif %}
-{% endblock %}
diff --git a/app/templates/todo/list.html b/app/templates/todo/list.html
new file mode 100644
index 0000000..20e8f4f
--- /dev/null
+++ b/app/templates/todo/list.html
@@ -0,0 +1,62 @@
+{% extends "base.html" %}
+
+{% block title %}
+{{ title }}
+{% endblock %}
+
+{% block content %}
+	{% if canApproveNew %}
+		<h2>Packages Awaiting Approval</h2>
+		<ul>
+			{% for p in packages %}
+				<li><a href="{{ p.getDetailsURL() }}">
+					{{ p.title }} by {{ p.author.display_name }}
+				</a></li>
+			{% else %}
+				<li><i>No packages need reviewing.</i></ul>
+			{% endfor %}
+		</ul>
+	{% endif %}
+
+	{% if canApproveScn %}
+		<h2>Screenshots Awaiting Approval</h2>
+		<ul>
+			{% for s in screenshots %}
+				<li>
+					<a href="{{ s.getEditURL() }}">{{ s.title }}</a>
+					on
+					<a href="{{ s.package.getDetailsURL() }}">
+						{{ s.package.title }} by {{ s.package.author.display_name }}
+					</a>
+				</li>
+			{% else %}
+				<li><i>No screenshots need reviewing.</i></ul>
+			{% endfor %}
+		</ul>
+	{% endif %}
+
+	{% if canApproveRel %}
+		<h2>Releases Awaiting Approval</h2>
+		<ul>
+			{% for r in releases %}
+				<li>
+					<a href="{{ r.getEditURL() }}">{{ r.title }}</a>
+					on
+					<a href="{{ r.package.getDetailsURL() }}">
+						{{ r.package.title }} by {{ r.package.author.display_name }}
+					</a>
+				</li>
+			{% else %}
+				<li><i>No releases need reviewing.</i></ul>
+			{% endfor %}
+		</ul>
+	{% endif %}
+
+	<h2>Forum Topics without a Package</h2>
+
+	<p>
+		There are
+		<a href="{{ url_for('todo_topics_page') }}">{{ topics_to_add }} packages</a>
+		to be added to cdb.
+	</p>
+{% endblock %}
diff --git a/app/templates/todo/topics.html b/app/templates/todo/topics.html
new file mode 100644
index 0000000..77f32c0
--- /dev/null
+++ b/app/templates/todo/topics.html
@@ -0,0 +1,34 @@
+{% extends "base.html" %}
+
+{% block title %}
+Topics to be Added
+{% endblock %}
+
+{% block content %}
+	<h1>Topics to be Added</h1>
+
+	<p>
+		{{ total - (topics | count) }} / {{ total }} packages have been added.
+		{{ topics | count }} remaining.
+	</p>
+
+	<table>
+		<tr>
+			<th>Id</th>
+			<th>Title</th>
+			<th>Author</th>
+			<th>Name</th>
+			<th>Link</th>
+		</tr>
+		{% for topic in topics %}
+			<tr>
+				<td>{{ topic.topic_id }}</td>
+				<td>[{{ topic.getType().value }}] <a href="https://forum.minetest.net/viewtopic.php?t={{ topic.topic_id}}">{{ topic.title }}</a></td>
+				<td><a href="{{ url_for('user_profile_page', username=topic.author.username) }}">{{ topic.author.display_name}}</a></td>
+				<td>{{ topic.name or ""}}</td>
+				<td><a href="{{ topic.link }}">{{ topic.link | domain }}</a></td>
+
+			</tr>
+		{% endfor %}
+	</table>
+{% endblock %}
diff --git a/app/templates/users/user_profile_page.html b/app/templates/users/user_profile_page.html
index 4631256..7181fc2 100644
--- a/app/templates/users/user_profile_page.html
+++ b/app/templates/users/user_profile_page.html
@@ -98,4 +98,27 @@
 {% from "macros/packagegridtile.html" import render_pkggrid %}
 {{ render_pkggrid(packages, show_author=False) }}
 
+{% if topics_to_add %}
+	<div class="box box_grey">
+		<h2>Topics to Add</h2>
+
+		<table class="box-body">
+			<tr>
+				<th>Id</th>
+				<th>Title</th>
+				<th>Name</th>
+				<th>Link</th>
+			</tr>
+			{% for topic in topics_to_add %}
+				<tr>
+					<td>{{ topic.topic_id }}</td>
+					<td>[{{ topic.getType().value }}] <a href="https://forum.minetest.net/viewtopic.php?t={{ topic.topic_id}}">{{ topic.title }}</a></td>
+					<td>{{ topic.name or ""}}</td>
+					<td><a href="{{ topic.link }}">{{ topic.link | domain }}</a></td>
+				</tr>
+			{% endfor %}
+		</table>
+	</div>
+{% endif %}
+
 {% endblock %}
-- 
cgit v1.2.3