Merge branch 'master' into 'main'

Added correct href attributes for assessment download links on the portfolio page.

See merge request !19

my_flask_app.py

 import os
 import secrets
-from flask import Flask, render_template, request, redirect, url_for, send_from_directory, abort
+from flask import Flask, render_template, request, redirect, url_for, send_from_directory, abort, current_app
 from flask_sqlalchemy import SQLAlchemy
 from models import db, Project
 
+
 app = Flask(__name__, static_folder='static')
 app.config['SEND_FILE_MAX_AGE_DEFAULT'] = 0
 app.config['SQLALCHEMY_DATABASE_URI'] = 'sqlite:///' + os.path.abspath(os.path.join(os.path.dirname(__file__), 'instance/site.db'))
@@ -83,8 +84,9 @@ def download_assessment(filename):
         abort(404)  # Return a 404 Not Found error
     except Exception as e:
         print(f"Error serving assessment file: {str(e)}")
-        app.logger.exception(f"Error serving assessment file: {str(e)}")
-        abort(500) 
+        current_app.logger.exception(f"Error serving assessment file: {str(e)}")
+        abort(500)
+
 
 if __name__ == '__main__':
     with app.app_context():

templates/portfolio.html

@@ -32,22 +32,20 @@
             <li><a href="{{ url_for('contact') }}">Contact</a></li>
         </ul>
     </nav>
-    <div id="portfolio">
-        <div class="container">
-            <h1 class="sub-title">Portfolio</h1>
-            <div class="cute-text-box">
-                <p>Welcome to my portfolio page! Here are some of my assessments for you to download:</p>
-                <p>Feel free to submit any questions you may have regarding my work on my Contact page.</p>
-            </div>
-            <div class="assessment-links">
-                <ul>
-                    <li><a href="{{ url_for('download_assessment', filename='c2051326_py.PDF') }}" target="_blank">CMT120 1a - PDF</a></li>
-                    <li><a href="{{ url_for('download_assessment', filename='c2051326_js.PDF') }}" target="_blank">CMT120 1b - PDF</a></li>
-                    <li><a href="{{ url_for('download_assessment', filename='Team_12 Assessment_1.pptx') }}" target="_blank">CMT313 1a</a></li>
-                    <li><a href="{{ url_for('download_assessment', filename='Risk_Register.PDF') }}" target="_blank">CMT313 1b - PDF</a></li>
-                    <li><a href="{{ url_for('download_assessment', filename='User_Case _diagram.PDF') }}" target="_blank">CMT313 1c - PDF</a></li>
-                </ul>
-            </div>
+    <div id="portfolio" class="container">
+        <h1 class="sub-title">Portfolio</h1>
+        <div class="cute-text-box">
+            <p>Welcome to my portfolio page! Here are some of my assessments for you to download:</p>
+            <p>Feel free to submit any questions you may have regarding my work on my Contact page.</p>
+        </div>
+        <div class="assessment-links">
+            <ul>
+                <li><a href="{{ url_for('download_assessment', filename='c2051326_py.PDF') }}" target="_blank">CMT120 1a - PDF</a></li>
+                <li><a href="{{ url_for('download_assessment', filename='c2051326_js.PDF') }}" target="_blank">CMT120 1b - PDF</a></li>
+                <li><a href="{{ url_for('download_assessment', filename='Team_12_Assessment_1.pptx') }}" target="_blank">CMT313 1a</a></li>
+                <li><a href="{{ url_for('download_assessment', filename='Risk_Register.PDF') }}" target="_blank">CMT313 1b - PDF</a></li>
+                <li><a href="{{ url_for('download_assessment', filename='User_Case_diagram.PDF') }}" target="_blank">CMT313 1c - PDF</a></li>
+            </ul>
         </div>
         <a href="{{ url_for('download_cv') }}" class="btn btn2" download="my-cv.docx">Download CV</a>
     </div>