progress count

userdb/db.py

@@ -18,9 +18,12 @@ app = Flask(__name__)
 @app.route("/track", methods = ['GET'])
 def track():
     if request.method == 'GET' and request.args.get('hash'):
+        
         hash = str(request.args.get('hash'))
+        cat = str(request.args.get('cat'))
         ua = str(request.args.get('ua'))
         url = str(request.values.get("url") or request.headers.get("Referer"))
+        
         if os.path.exists('db.json'):
             with open('db.json', 'r') as db:
                 db = json.loads(db.read())
@@ -35,7 +38,7 @@ def track():
         visits = list(set(visits))
         db.update({
             hash : { 
-                'visits' : visits,
+                cat : visits,
                 'agent' : ua
             }
         })
@@ -45,7 +48,7 @@ def track():
         with open('db.json', 'w+') as dbw:
             dbw.write(json.dumps(db, indent=4))
 
-        return str(len(db[hash]))
+        return str(len(db[hash][cat]))
     else:
         return 'hash missing'
 

web/nfc-theme/static/user.js

@@ -22,7 +22,16 @@ if ( !Cookies.get('nfcexplorer') ) {
     Cookies.set('nfcexplorer', generateUUID())
 }
 
+cat = document.querySelector('meta[data-category]').content
+
 fetch('https://nmns.place/track?' + new URLSearchParams({
     hash: Cookies.get('nfcexplorer'),
     ua: ua,
-}));
+    cat: cat
+})).then(response => {
+  progress = document.querySelector('span#progress').content
+  document.querySelector('span#progress').content = response
+})
+.catch(error => {
+  // handle the error
+});

web/nfc-theme/templates/article.html

@@ -1,10 +1,17 @@
 {% extends "base.html" %}
+{% block head %}
+  <meta charset="utf-8" />
+  <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+  <meta data-category="{{ article.category.slug }}" />
+  <link href="{{ SITEURL }}/theme/local.css" rel="stylesheet">
+{% endblock head %}
 {% block content %}
   <section id="content" class="body">
     <div class="entry-content">
       {{ article.content }}
       {% if article.metadata.geohash %}
       <a href="{{ SITEURL }}/{{ article.category.url }}">Map</a>
+      <span id="progress">{% for cat, art in categories %}{% if cat.slug == category.slug %}{{ art|count }}{% endif %}{% endfor %}</span>
       {% endif %}
     </div>
   </section>

web/nfc-theme/templates/base.html

@@ -4,7 +4,7 @@
   <title>{% block title %}{{ SITENAME }}{% endblock title %}</title>
   {% block head %}
   <meta charset="utf-8" />
-        <meta name="viewport" content="width=device-width, initial-scale=1.0">
+  <meta name="viewport" content="width=device-width, initial-scale=1.0" />
   <link href="{{ SITEURL }}/theme/local.css" rel="stylesheet">
   {% endblock head %}
 </head>

web/pelicanconf.py

@@ -52,10 +52,10 @@ PAGE_PATHS = ['pages',]
 SUMMARY_MAX_LENGTH = 0
 DEFAULT_DATE_FORMAT = '%Y-%m-%d'
 
-DEFAULT_CATEGORY = 'tag'
-CATEGORIES_SAVE_AS = 'projects/index.html'
-CATEGORY_URL = 'projects/{slug}'
-CATEGORY_SAVE_AS = 'projects/{slug}/index.html'
+DEFAULT_CATEGORY = 'ad-hoc'
+CATEGORIES_SAVE_AS = 'zones/index.html'
+CATEGORY_URL = 'zone/{slug}'
+CATEGORY_SAVE_AS = 'zone/{slug}/index.html'
 
 DELETE_OUTPUT_DIRECTORY = True
 

web/plugins/geodata/geodata.py

@@ -33,7 +33,7 @@ def makeKML():
                 point.appendChild( coordinates )
                 placemark.appendChild( point )
                 root.childNodes[0].childNodes[0].childNodes[0].appendChild( placemark )
-            with open('output/projects/' + category + '.kml', 'w') as xml_file:
+            with open(collection[category]["path"] + '.kml', 'w') as xml_file:
                 root.writexml(xml_file, indent="", addindent="  ", newl='\n')
 
 def makeGPX():
@@ -50,10 +50,12 @@ def makeGPX():
                 name.appendChild( title )
                 wpt.appendChild( name )
                 root.childNodes[0].appendChild( wpt )
-            with open('output/projects/' + category + '.gpx', 'w') as xml_file:
+            with open( collection[category]["path"] + '.gpx', 'w') as xml_file:
                 root.writexml(xml_file, indent="", addindent="  ", newl='\n')
 
 def geodata(generator):
+    output = generator.settings.get('OUTPUT_PATH')
+    filepath = generator.settings.get('CATEGORY_URL')
     for category, articles in generator.categories:
         locations = []
         for article in articles:
@@ -65,6 +67,7 @@ def geodata(generator):
         collection.update({
             category.slug : {
                 "name" : category.name,
+                "path" : output + '/' + filepath.replace('{slug}', category.slug),
                 "points" : locations
             }})