Rename map router to location

Author: ggeerraarrdd

app.py

@@ -18,16 +18,16 @@
 
 Session(app)
 
-# Set env variables
-map_api_key = os.environ.get("MAP_API_KEY")
-
-# Set database
-DATABASE_NAME = "lafs.db"
+# Set constants
+MAP_API_KEY = os.environ.get("MAP_API_KEY_DEV")
+DATABASE_NAME = os.environ.get("DATABASE_NAME")
 
 
 @app.route("/", methods=["GET", "POST"])
 def index():
+    """TODO: function docstring """
 
+    print(MAP_API_KEY)
     if request.method == "POST":
         return redirect("/")
 
@@ -38,7 +38,7 @@ def index():
 
         # Update session
         session["active_series_id"] = session["current_series_id"] = query_result[0]
-        
+
         # NOTE: For development purposes, change current_series_id to first series, not actual current
         session["active_series_id"] = session["current_series_id"] = 1
 
@@ -48,34 +48,35 @@ def index():
         # Get info on [past] (1) series, (2) schedules, and (3) series ids
         series, schedules, series_ids = get_series_data(DATABASE_NAME, series_id)
 
-        return render_template("index.html", 
-                               series=series, 
-                               schedules=schedules, 
+        return render_template("index.html",
+                               series=series,
+                               schedules=schedules,
                                series_ids=series_ids)
 
 
 @app.route("/series", methods=["GET", "POST"])
 def series():
+    """TODO: function docstring """
 
     current_series_id = session["current_series_id"]
 
     if request.method == "POST":
 
-        # Get info of clicked series id 
+        # Get info of clicked series id
         series_id = int(request.form.get("series-id"))
 
         if series_id == current_series_id:
             return redirect("/")
         else:
-            # Update session variable active_series_id 
+            # Update session variable active_series_id
             session["active_series_id"] = series_id
 
             # Get info on [past] (1) series, (2) schedules, and (3) series ids
             series, schedules, series_ids = get_series_data(DATABASE_NAME, series_id)
-    
-        return render_template("index.html", 
-                               series=series, 
-                               schedules=schedules, 
+
+        return render_template("index.html",
+                               series=series,
+                               schedules=schedules,
                                series_ids=series_ids)
 
     else:
@@ -84,6 +85,7 @@ def series():
 
 @app.route("/film", methods=["GET", "POST"])
 def film():
+    """TODO: function docstring """
 
     if request.method == "POST":
         # Get info of [active] series id
@@ -99,42 +101,44 @@ def film():
         # Get info of requested film
         film = queries.get_info_film(DATABASE_NAME, film_id)
 
-        return render_template("film.html", 
-                               series=series, 
-                               schedules=schedules, 
-                               series_ids=series_ids, 
+        return render_template("film.html",
+                               series=series,
+                               schedules=schedules,
+                               series_ids=series_ids,
                                film=film)
 
     else:
         return redirect("/")
 
 
-@app.route("/map")
-def map():
-    
+@app.route("/location")
+def location():
+    """TODO: function docstring """
+
     # Get info of [active] series id
     series_id = session["active_series_id"]
 
     # Get info on [past] (1) series, (2) schedules, and (3) series ids
     series, schedules, series_ids = get_series_data(DATABASE_NAME, series_id)
 
-    return render_template("map.html", 
-                           series=series, 
-                           schedules=schedules, 
-                           series_ids=series_ids, 
-                           map_api_key=map_api_key)
+    return render_template("location.html",
+                           series=series,
+                           schedules=schedules,
+                           series_ids=series_ids,
+                           map_api_key=MAP_API_KEY)
 
 
 @app.route("/org")
 def org():
+    """TODO: function docstring """
 
     # Get info of [active] series id
     series_id = session["active_series_id"]
 
     # Get info on [past] (1) series, (2) schedules, and (3) series ids
     series, schedules, series_ids = get_series_data(DATABASE_NAME, series_id)
 
-    return render_template("org.html", 
-                           series=series, 
-                           schedules=schedules, 
+    return render_template("org.html",
+                           series=series,
+                           schedules=schedules,
                            series_ids=series_ids)

templates/layout.html

@@ -8,7 +8,7 @@
     <meta name="viewport" content="initial-scale=1, width=device-width">
     <link href="/static/favicon.ico" rel="icon">
     <link href="/static/styles.css" rel="stylesheet">
-    {%- block map %}{% endblock %}
+    {%- block location %}{% endblock %}
     <title>
         Landscape Architecture Film Series @ UIUC — {% block title %}{% endblock %}
     </title>
@@ -41,7 +41,7 @@
 
             <!-- Top Container - Location -->
             <div class="top-container-location top-container-location-screen">
-                <a href="/map" style="color: {{ series.color3 }};">P</a>LYM AUDITORIUM<br>
+                <a href="/location" style="color: {{ series.color3 }};">P</a>LYM AUDITORIUM<br>
                 134 TEMPLE BUELL HALL<br>
                 WEDNESDAYS @ 7:30pm<br>
                 FREE ADMISSION<br>

templates/map.html renamed to templates/location.html

@@ -1,6 +1,6 @@
 {% extends "layout.html" %}
 
-{% block map %}
+{% block location %}
 <script type="module" src="/static/map.js"></script>
 {% endblock %}