Update content and design

Author: ggeerraarrdd

.gitignore

@@ -8,6 +8,8 @@
 flask_session/
 /*_session/
 
+films.txt
+
 ####################################################
 
 # Byte-compiled / optimized / DLL files

README.md

@@ -8,7 +8,7 @@ In need of a website to use as a vehicle to play around with a few AWS services
 
 This, then, is that 20-year-old static website ressurrected as a dynamic web application with a data model to speak of, using modern tools such Flask, SQLite, VS Code and Git.
 
-<picture><img src="/static/images/film-series1.jpg"></picture>
+<picture><img src="/static/images/film-series1_2.jpg"></picture>
 More screenshots below.
 
 ## Disclaimer
@@ -27,6 +27,7 @@ N/A
 ### Dependencies
 
 * Flask==2.2.5
+* flask_session==0.5.0
 
 ### Usage
 
@@ -63,11 +64,6 @@ $ echo $MAP_API_KEY
 ## Author(s)
 * [@ggeerraarrdd](https://github.com/ggeerraarrdd/)
 
-## Version History
-* 1.0.0
-    * October 16, 2023
-    * Minimum viable product
-
 ## Future Work
 
 * Change database to PostgreSQL and migrate to AWS RDS
@@ -81,5 +77,7 @@ $ echo $MAP_API_KEY
 * The distribution code for CS50's Finance problem served as a template for the app.
 
 ## Screenshots
-<picture><img src="/static/images/film-series2.jpg"></picture>
-<picture><img src="/static/images/film-series3.jpg"></picture>
+<picture><img src="/static/images/film-series2_2.jpg"></picture>
+<picture><img src="/static/images/film-series3_2.jpg"></picture>
+<picture><img src="/static/images/film-series4_1.jpg"></picture>
+<picture><img src="/static/images/film-series5_1.jpg"></picture>

app.py

@@ -9,6 +9,7 @@
 
 # Configure application
 app = Flask(__name__)
+
 app.config['SEND_FILE_MAX_AGE_DEFAULT'] = 0
 app.config['TEMPLATES_AUTO_RELOAD'] = True
 
@@ -17,7 +18,7 @@
 app.config["SESSION_TYPE"] = "filesystem"
 Session(app)
 
-# Configure CS50 Library to use SQLite database
+# Set SQLite database variable
 db = "lafs.db"
 
 # Make sure Google Maps API key is set
@@ -30,16 +31,7 @@
 else:
     print("MAP_API_KEY set")
     map_api_key = os.environ.get("MAP_API_KEY")
-
-
-@app.after_request
-def after_request(response):
-    """Ensure responses aren't cached"""
-    response.headers["Cache-Control"] = "no-cache, no-store, must-revalidate, max-age=0"
-    response.headers["Expires"] = 0
-    response.headers["Pragma"] = "no-cache"
-    return response
-
+    
 
 @app.route("/", methods=["GET", "POST"])
 def index():
@@ -82,12 +74,18 @@ def series():
     # Populate Bottom Container
     # List of films and their scheduled showtimes for selected past series
 
+    # Temporary bypass to session timeouts
+    try:
+        current_series_id = session["current_series_id"]
+    except KeyError:
+        current_series_id = 1
+
     if request.method == "POST":
 
         # Get info of clicked series id 
         series_id = int(request.form.get("series-id"))
 
-        if series_id == session["current_series_id"]:
+        if series_id == current_series_id:
             return redirect("/")
         else:
             # Update session variable active_series_id 
@@ -168,5 +166,3 @@ def org():
 
     return render_template("org.html", series=series, schedules=schedules, series_ids=series_ids)
 
-
-# chrome://net-internals/#sockets

lafs.db

@@ -37,6 +37,7 @@ def get_info_series(db, series_id):
     query = query + "series_title, "
     query = query + "series_brief, "
     query = query + "series_poster, "
+    query = query + "series_poster_url, "
     query = query + "series_display, "
     query = query + "color1, "
     query = query + "color2, "
@@ -98,7 +99,35 @@ def get_info_series_ids(db):
     cursor = connection.cursor()
 
     # Query db
-    query = "SELECT DISTINCT(series_id), series_display FROM series; "
+    query = "SELECT DISTINCT(series_id), series_semester, series_year, series_display FROM series; "
+    cursor.execute(query)
+
+    # Get rows
+    rows = cursor.fetchall()
+
+    # Get the column names from cursor.description
+    columns = [column[0] for column in cursor.description]
+
+    # Convert each row into a dictionary using zip
+    result = [dict(zip(columns, row)) for row in rows]
+
+    return(result)
+
+
+def get_info_serieses(db):
+    """Get info of series ids."""
+
+    # Create connection and cursor
+    connection = sqlite3.connect(db, check_same_thread=False)
+    connection.row_factory = sqlite3.Row
+    cursor = connection.cursor()
+
+    # Query db
+    query = "SELECT DISTINCT(series_id), "
+    query = query + "series_semester, "
+    query = query + "series_year, "
+    query = query + "series_display " 
+    query = query + "FROM series; "
     cursor.execute(query)
 
     # Get rows

queries.py

@@ -0,0 +1,2 @@
+Flask==2.2.5
+flask_session==0.5.0