Rebased with dev and fixed issues that resulted from that

Author: pikachu0542

Dockerfile

@@ -35,8 +35,8 @@ ENV PORT=${PORT}
 EXPOSE ${PORT}
 
 COPY conditional /opt/conditional/conditional
-COPY *.py package.json /opt/conditional
-COPY --from=build-frontend /opt/conditional/conditional/static /opt/conditional/conditional/static
+COPY *.py package.json /opt/conditional/
+COPY --from=build-frontend /opt/conditional/conditional/static/ /opt/conditional/conditional/static/
 
 RUN ln -sf /usr/share/zoneinfo/America/New_York /etc/localtime
 

conditional/blueprints/major_project_submission.py

@@ -1,10 +1,9 @@
 import json
 import os
-import requests
-
 import requests
 import boto3
 
+from conditional.models.models import MajorProject, MajorProjectSkill
 from config import AWS_ACCESS_KEY_ID, AWS_SECRET_ACCESS_KEY
 from flask import Blueprint
 from flask import request
@@ -18,8 +17,6 @@
 
 from conditional.util.context_processors import get_member_name
 
-from conditional.models.models import MajorProject, MajorProjectSkill
-
 from conditional.util.ldap import ldap_is_eval_director
 from conditional.util.ldap import ldap_get_member
 from conditional.util.flask import render_template
@@ -55,7 +52,7 @@ def display_major_project(user_dict=None):
         MajorProject.id == MajorProjectSkill.project_id
     ).group_by(MajorProject.id
     ).where(MajorProject.date >= start_of_year()
-    ).order_by(desc(MajorProject.date))
+    ).order_by(MajorProject.date)
 
     major_projects = [
         {
@@ -133,7 +130,7 @@ def submit_major_project(user_dict=None):
 
     # All fields are required in order to be able to submit the form
     # TODO: Do we want any of the fields to have enforced min or max lengths?
-    if name == "" or tldr == "" or time_spent == "" or skills == "" or description == "":
+    if not name or not tldr or not time_spent or not description:
         return jsonify({"success": False}), 400
 
     # TODO: Ensure all the information is being passed to the object
@@ -144,11 +141,13 @@ def submit_major_project(user_dict=None):
     db.session.commit()
 
 
+    # project_id = project.id
     project = MajorProject.query.filter(
-        MajorProject.name == name and MajorProject.uid == user_id
+        MajorProject.name == name,
+        MajorProject.uid == user_id
     ).first()
 
-    skills_list = filter(lambda x: x != 'None', skills)
+    skills_list = list(filter(lambda x: x != 'None', skills))
     print(f"Skills: {list(skills_list)}")
 
     for skill in skills_list:

frontend/javascript/modules/majorProjectForm.js

@@ -52,6 +52,8 @@ export default class MajorProjectForm {
 
         Array.from(this.form.getElementsByClassName('skill-tag')).forEach(tag => skills.push(tag.firstChild.data))
 
+        console.log("Links: " + this.form.querySelector('textarea[name=links]').value);
+
         let payload = {
             projectName: this.form.querySelector('input[name=name]').value,
             projectTldr: this.form.querySelector('input[name=tldr]').value,

migrations/versions/217b5842448c_.py

@@ -1,13 +1,13 @@
-"""add new fields to major project form
+"""empty message
 
-Revision ID: 09603d1cfc38
+Revision ID: 6c4cf35d7c0c
 Revises: f1d08673b870
-Create Date: 2026-03-01 10:46:33.652106
+Create Date: 2026-03-06 15:42:50.323042
 
 """
 
 # revision identifiers, used by Alembic.
-revision = '09603d1cfc38'
+revision = '6c4cf35d7c0c'
 down_revision = 'f1d08673b870'
 
 from alembic import op