From 457e002d9837e8f487c5a55d489be0e3e29ea9df Mon Sep 17 00:00:00 2001
From: rukwashai <rukwashai@berea.edu>
Date: Mon, 15 Jun 2026 19:24:05 +0000
Subject: [PATCH 1/5] Add Daniel Rukwasha to contributors list

---
 app/config/default.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/config/default.yml b/app/config/default.yml
index e4b9b14e2..fb0521302 100644
--- a/app/config/default.yml
+++ b/app/config/default.yml
@@ -181,3 +181,5 @@ contributors:
     role: "Software Engineer"
   - name: "Alina Petrosyants"
     role: "Software Engineer"
+  - name: "Daniel Rukwasha"
+    role: "Software Engineer"

From 99cf15ff592422fe8296b811adb862602543ab4d Mon Sep 17 00:00:00 2001
From: rukwashai <rukwashai@berea.edu>
Date: Mon, 15 Jun 2026 19:36:35 +0000
Subject: [PATCH 2/5] added my name

---
 requirements.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/requirements.txt b/requirements.txt
index 39044c925..aeb9c89fd 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -4,7 +4,7 @@ attrs==25.3.0
 blessings==1.7
 blinker==1.9.0
 certifi==2025.8.3
-cffi==1.17.1
+cffi
 chardet==5.2.0
 charset-normalizer==3.4.2
 click==8.2.1

From 1098dd8f940f6df14105ea9b31fc989e6847e1ce Mon Sep 17 00:00:00 2001
From: rukwashai <rukwashai@berea.edu>
Date: Wed, 17 Jun 2026 10:08:09 -0400
Subject: [PATCH 3/5] I resolved the conflict

---
 app/config/default.yml | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/app/config/default.yml b/app/config/default.yml
index fb0521302..564d1d806 100644
--- a/app/config/default.yml
+++ b/app/config/default.yml
@@ -183,3 +183,11 @@ contributors:
     role: "Software Engineer"
   - name: "Daniel Rukwasha"
     role: "Software Engineer"
+  - name: "Denys Zhytkov"
+    role: "Software Engineer"
+  - name: "Bhushan Sah"
+    role: "Software Engineer"
+  - name: "Julius Fritz"
+    role: "Software Engineer"
+  - name: "Artem Kurasov"
+    role: "Software Engineer"

From 48fc32875266a82eb1a0f0ff953ba832fab16729 Mon Sep 17 00:00:00 2001
From: rukwashai <rukwashai@berea.edu>
Date: Wed, 17 Jun 2026 10:19:50 -0400
Subject: [PATCH 4/5] Fxing this

---
 app/config/default.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/config/default.yml b/app/config/default.yml
index 564d1d806..fe2482478 100644
--- a/app/config/default.yml
+++ b/app/config/default.yml
@@ -181,8 +181,6 @@ contributors:
     role: "Software Engineer"
   - name: "Alina Petrosyants"
     role: "Software Engineer"
-  - name: "Daniel Rukwasha"
-    role: "Software Engineer"
   - name: "Denys Zhytkov"
     role: "Software Engineer"
   - name: "Bhushan Sah"
@@ -191,3 +189,5 @@ contributors:
     role: "Software Engineer"
   - name: "Artem Kurasov"
     role: "Software Engineer"
+  - name: "Daniel Rukwasha"
+    role: "Software Engineer"
\ No newline at end of file

From 049134dd2613a2b891e5d62195aadcef2b5650b1 Mon Sep 17 00:00:00 2001
From: rukwashai <rukwashai@berea.edu>
Date: Wed, 17 Jun 2026 10:36:59 -0400
Subject: [PATCH 5/5] development changes

---
 .devcontainer/Dockerfile                      |  2 +-
 .devcontainer/docker-compose.yml              |  3 +-
 .../admin/manageServiceLearningFaculty.html   | 29 +++++++++++++++++--
 app/templates/main/userProfile.html           | 12 ++++----
 4 files changed, 36 insertions(+), 10 deletions(-)

diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
index d47696d51..a5dba9a5d 100644
--- a/.devcontainer/Dockerfile
+++ b/.devcontainer/Dockerfile
@@ -1,4 +1,4 @@
-FROM mcr.microsoft.com/devcontainers/python:0-3.11
+FROM mcr.microsoft.com/devcontainers/python:3.13
 
 ENV PYTHONUNBUFFERED 1
 
diff --git a/.devcontainer/docker-compose.yml b/.devcontainer/docker-compose.yml
index e767a9714..987d9bae4 100644
--- a/.devcontainer/docker-compose.yml
+++ b/.devcontainer/docker-compose.yml
@@ -18,6 +18,7 @@ services:
   db:
     image: mysql
     restart: always
+    command: --require_secure_transport=OFF
     environment: 
       MYSQL_DATABASE: 'celts'
       MYSQL_USER: 'celts_user'
@@ -31,4 +32,4 @@ services:
       - celts_data:/var/lib/mysql
     
 volumes:
-  celts_data:
\ No newline at end of file
+  celts_data:
diff --git a/app/templates/admin/manageServiceLearningFaculty.html b/app/templates/admin/manageServiceLearningFaculty.html
index b5ddf20dd..4029fcd9f 100644
--- a/app/templates/admin/manageServiceLearningFaculty.html
+++ b/app/templates/admin/manageServiceLearningFaculty.html
@@ -52,7 +52,14 @@ <h2>Unapproved</h2>
 
   {########################### Unapproved Table ###############################}
     {% if unapprovedCourses | length == 0 %}
-    <h5 class="ms-3">There are no unapproved courses for {{ term.description }}.</h5>
+   <table class="table table-striped border pb-5">
+
+      <tbody>
+        <tr>
+          <td>There are no unapproved courses for {{ term.description }}.</td>
+        </tr>
+      </tbody>
+    </table>
     {% else %}
     <table class="table table-striped border">
       <thead>
@@ -95,7 +102,14 @@ <h5 class="ms-3">There are no unapproved courses for {{ term.description }}.</h5
   {########################### Approved Table #################################}
     <h2>Approved</h2>
     {% if approvedCourses | length == 0 %}
-    <h5 class="ms-3">There are no approved courses for {{ term.description }}.</h5>
+   <table class="table table-striped border pb-5">
+
+      <tbody>
+        <tr>
+          <td>There are no approved courses for {{ term.description }}.</td>
+        </tr>
+      </tbody>
+    </table>
     {% else %}
     <table class="table table-striped border">
       <thead>
@@ -135,7 +149,16 @@ <h2>Imported</h2>
 
   <!-- IMPORTED COURSES -->
     {% if importedCourses | length == 0 %}
-    <h5 class="ms-3 pb-3">There are no imported courses for {{ term.description }}.</h5>
+   <table class="table table-striped border pb-5">
+
+      <tbody>
+        <tr>
+          <td>There are no imported courses for {{ term.description }}.</td>
+        </tr>
+      </tbody>
+    </table>
+</body>
+</html>
     {% else %}
     <table class="table table-striped border pb-5">
       <thead>
diff --git a/app/templates/main/userProfile.html b/app/templates/main/userProfile.html
index 49fa59764..75fa86a11 100644
--- a/app/templates/main/userProfile.html
+++ b/app/templates/main/userProfile.html
@@ -97,10 +97,10 @@ <h3 class="accordion-header" id="headingZero">
 <!-- ################# Upcoming Events ################ -->
   <div class="accordion-item">
     <h3 class="accordion-header" id="headingOne">
-      {% set focus = "open" if visibleAccordion == "upcoming" or (not visibleAccordion and volunteer.username == g.current_user.username) else "collapsed" %}
+      {% set focus = "open" if visibleAccordion == "upcoming"  else "collapsed" %}
       <button class="accordion-button {{focus}}" type="button" data-bs-toggle="collapse" data-bs-target="#collapseOne" aria-expanded="true" aria-controls="collapseOne">Upcoming Events</button>
     </h3>
-    {% set show = "show" if visibleAccordion == "upcoming" or (not visibleAccordion and volunteer.username == g.current_user.username) else ""%}
+    {% set show = "show" if visibleAccordion == "upcoming" else ""%}
     <div id="collapseOne" class="accordion-collapse collapse {{show}} " aria-labelledby="headingOne" data-bs-parent="#userProfile">
       <div class="accordion-body">
         <div class="row table-responsive" style="flex-direction: column">
@@ -191,12 +191,12 @@ <h5>You have not participated in any events.</h5>
 <!-- ################# Program Table ################ -->
   <div class="accordion-item">
     <h3 class="accordion-header" id="headingThree">
-      {% set focus = "open" if visibleAccordion == "programTable" or (not visibleAccordion and volunteer.username != g.current_user.username) else "collapsed" %}
+      {% set focus = "open" if visibleAccordion == "programTable"  else "collapsed" %}
       <button class="accordion-button {{focus}}" type="button" data-bs-toggle="collapse" data-bs-target="#collapseThree" aria-expanded="false" aria-controls="collapseThree">
           Programs
       </button>
     </h3>
-    {% set show = "show" if visibleAccordion == "programTable" or (not visibleAccordion and volunteer.username != g.current_user.username) else "" %}
+    {% set show = "show" if visibleAccordion == "programTable"  else "" %}
     <div id="collapseThree" class="accordion-collapse collapse {{show}}" aria-labelledby="headingThree" data-bs-parent="#userProfile">
       <div class="accordion-body">
         <div class="table-responsive">
@@ -208,7 +208,9 @@ <h3 class="accordion-header" id="headingThree">
                 <th scope="col">Training</th>
                 {% if g.current_user.isCeltsAdmin or g.current_user.isCeltsStudentStaff%}
                   <th scope="col">Eligibility</th>
-                  <th scope="col">On Transcript</th>
+                  {% if g.current_user.isCeltsAdmin%}
+                    <th scope="col">On Transcript</th>
+                    {% endif %}
                 {% endif %}
 
               </tr>