Fixed bugs when generating URLs

app.py

@@ -23,6 +23,7 @@ from colorsys import rgb_to_hsv
 from flask import Flask, render_template, request, redirect, url_for, session, abort
 from flask_pymongo import PyMongo
 from werkzeug.exceptions import HTTPException
+from werkzeug.routing.exceptions import BuildError
 from bson import ObjectId
 import bson.json_util as bson
 import requests
@@ -126,16 +127,25 @@ def render_main():
         else None
     )
     results = {"ade": {}, "bea": {}, "cam": {}, "des": {}}
+    short_results = {"ade": {}, "bea": {}, "cam": {}, "des": {}}
     for ddata in dsdata:
-        if not can_access(ddata, udata):
-            continue
         if ddata["cat"] not in results[ddata["quad"]]:
             results[ddata["quad"]][ddata["cat"]] = {}
-        results[ddata["quad"]][ddata["cat"]][ddata["name"]] = ddata["id"]
+        if not can_access(ddata, udata):
+            results[ddata["quad"]][ddata["cat"]][ddata["name"]] = None
+            continue
+        try:
+            url = url_for(ddata["id"])
+            results[ddata["quad"]][ddata["cat"]][ddata["name"]] = url
+            short_results[ddata["quad"]][ddata["name"]] = url
+        except BuildError:
+            results[ddata["quad"]][ddata["cat"]][ddata["name"]] = None
+
     return render_template(
         "index.html",
         fpdata=fpdata,
         domains=results,
+        sdomains=short_results,
         quad=(request.endpoint or "ade")[-3:],
     )
 
@@ -472,3 +482,8 @@ def lighting():
 @app.errorhandler(HTTPException)
 def handle_error(error):
     return render_template("error.html", error=error), error.code
+
+
+@app.route("/swt/basic")
+def swt_basic():
+    return render_template("priv/swtbasic.html")