Merge pull request #21 from simcax/fix/url-to-activities

Fix/url to activities

Author: simcax

fly.toml

@@ -16,6 +16,7 @@ dockerfile = "docker/Dockerfile"
   API_VERSION = "version=1"
   API_MEMBERS_API = "members"
   API_ACTIVITIES_API = "activities"
+  ACTIVITY_LIST_URL = "https://activities.lejre.fitness/activity_list"
 
 [http_service]
   internal_port = 8000

lfweb/main/routes.py

@@ -33,7 +33,14 @@ def memberships():
     Renders the memberships page
     """
     memberdata = Memberdata()
-    return render_template("snippets/membership_test.html", memberdata=memberdata)
+    activity_list_url = os.environ.get("ACTIVITY_LIST_URL")
+    if activity_list_url is None:
+        logger.warning("ACTIVITY_LIST_URL not set in environment variables")
+    return render_template(
+        "snippets/membership.html",
+        memberdata=memberdata,
+        activity_list_url=activity_list_url,
+    )
 
 
 @frontpage_bp.route("/doorcount")

lfweb/templates/home.html

@@ -5,7 +5,7 @@ <h1>{% block title %}{% endblock %}</h1>
 
 <div class="border-5 border-lime-300">
     <div class="grow">
-        {% include 'navbar_tw_test.html' %}
+        {% include 'navbar.html' %}
     </div>
     <div class="flex flex-col lg:flex-row w-full">
         <!-- Original three-panel layout -->