Revert the in-progress country selection work

Moved to it's own branch.

setup.py

@@ -52,7 +52,6 @@
                 "web/templates/index.html",
                 "web/templates/connect.html",
                 "web/templates/confirm.html",
-                "web/templates/countries.js",
             ],
         ),
         (

test/test_crda.py

@@ -4,59 +4,3 @@
 # License-Filename: LICENSE
 #
 
-from pathlib import Path
-from typing import NamedTuple
-
-import pytest
-
-from comitup.crda import crda_get, crda_put
-
-
-class TestCase(NamedTuple):
-    teststr: str
-    result: str
-
-
-read_cases = [
-    TestCase("", ""),
-    TestCase("REGDOMAIN=", ""),
-    TestCase("REGDOMAIN=US", "US"),
-    TestCase("REGDOMAIN = US", "US"),
-    TestCase("REGDOMAIN=US ", "US"),
-    TestCase("foo\nREGDOMAIN=US\nfoo", "US"),
-]
-
-
-@pytest.fixture(params=read_cases)
-def crda_env(request, tmp_path):
-    case = request.param
-    crda_path = tmp_path / "crda"
-    crda_path.write_text(case.teststr)
-
-    class CrdaFixtureCase(NamedTuple):
-        path: Path
-        result: str
-
-    return CrdaFixtureCase(crda_path, case.result)
-
-
-def test_crda_null():
-    pass
-
-
-def test_crda_get(crda_env):
-    assert crda_get(str(crda_env.path)) == crda_env.result
-
-
-def test_crda_put(crda_env):
-    crda_put("CA", path=str(crda_env.path))
-
-    assert crda_get(path=str(crda_env.path)) == "CA"
-
-
-def test_crda_nofile_put(crda_env):
-    crda_put("CA", path=str(crda_env.path.parent / "bogus"))
-
-
-def test_crda_nofile_get(crda_env):
-    crda_get(path=str(crda_env.path.parent / "bogus"))

web/comitupweb.py

@@ -11,14 +11,12 @@
 # or later
 #
 
-import json
 import logging
 import sys
 import time
 import urllib
 from logging.handlers import TimedRotatingFileHandler
 from multiprocessing import Process
-from pathlib import Path
 
 from cachetools import TTLCache, cached
 from flask import (
@@ -39,13 +37,6 @@
 ciu_client = None  # type: ignore
 LOG_PATH = "/var/log/comitup-web.log"
 TEMPLATE_PATH = "/usr/share/comitup/web/templates"
-SERVER_PORT = 80
-DEBUG = False
-
-# LOG_PATH = "/tmp/comitup-web.log"
-# TEMPLATE_PATH = "./templates"
-# SERVER_PORT = 8000
-# DEBUG=True
 
 ttl_cache: TTLCache = TTLCache(maxsize=10, ttl=5)
 
@@ -96,16 +87,8 @@ def index():
                 point["ssid"]
             )
         log.info("index.html - {} points".format(len(points)))
-
-        with open(str(Path(TEMPLATE_PATH) / "countries.json"), "r") as fp:
-            countries = json.load(fp)
-
         return render_template(
-            "index.html",
-            points=points,
-            can_blink=ciu.can_blink(),
-            default_country="",
-            countries=countries,
+            "index.html", points=points, can_blink=ciu.can_blink()
         )
 
     @app.route("/confirm")
@@ -193,7 +176,7 @@ def main():
     ciu_client.ciu_points()
 
     app = create_app(log)
-    app.run(host="0.0.0.0", port=SERVER_PORT, debug=DEBUG, threaded=True)
+    app.run(host="0.0.0.0", port=80, debug=False, threaded=True)
 
 
 if __name__ == "__main__":

web/templates/index.html

@@ -58,22 +58,6 @@
                {% endif %}
             </div>
        </div>
-        <div class="uk-width-1-1 uk-text-center">
-            <p class="uk-text-large">Set the WiFi country code</p>
-        </div>
-	<form action="/country" method="get">
-            <div class="uk-grid uk-grid-small">
-                <div class="uk-width-2-3">
-                    <input class="uk-input" list="countries" name="country" id="country" value="United States of America" autocomplete="on">
-	            <datalist id="countries">{% for country in countries %}
-			    <option value="{{ country.name }}"/>{% endfor %}
-                    </datalist>
-                </div>
-                <div class="uk-width-1-3">
-                    <button type="submit" value="submit" class="uk-button uk-button-primary uk-width-expand">Submit</button>
-                </div>
-            </div>
-          </form>
     </div>
 </div>