From 7a9dafc3b2cafb1117a5b3c527a58439cd573a93 Mon Sep 17 00:00:00 2001 From: Johnny Santamaria Date: Mon, 18 May 2026 19:19:23 +0000 Subject: [PATCH 1/3] dded team page and Johnny's intro --- templates/students_2026.html | 12 ++++++++++++ templates/teams/Johnny_Madison.html | 12 ++++++++++++ 2 files changed, 24 insertions(+) create mode 100644 templates/teams/Johnny_Madison.html diff --git a/templates/students_2026.html b/templates/students_2026.html index b6455573..57964bae 100644 --- a/templates/students_2026.html +++ b/templates/students_2026.html @@ -292,6 +292,18 @@

Summer 2026 Cohort

Wootark Kim, Josue Nava - Jimenez +
+
+ +
+
Johnny Santamaria
+
School: San Francisco State University
+

I look forward to working with my teammate and mentor in open source to get a depper understanding of codebases rather than using AI as a foundation +

+ Johnny and Madison +
+ + \ No newline at end of file diff --git a/templates/teams/Johnny_Madison.html b/templates/teams/Johnny_Madison.html new file mode 100644 index 00000000..3ae3622c --- /dev/null +++ b/templates/teams/Johnny_Madison.html @@ -0,0 +1,12 @@ + + + + + + Team page + + +

Team Johnny and Madison

+

+ + \ No newline at end of file From 9bbb8cded67fb68c6f84eaf979d1101e191c4d13 Mon Sep 17 00:00:00 2001 From: Johnny Santamaria Date: Mon, 18 May 2026 19:57:24 +0000 Subject: [PATCH 2/3] cherry pick since changes on main branch --- app.py | 4 ++++ templates/students_2026.html | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/app.py b/app.py index 0cac2d6f..c47bd7e5 100644 --- a/app.py +++ b/app.py @@ -573,3 +573,7 @@ def team_woo_jos(): def Kaur_Arteaga_SantaMaria(): return render_template('teams/Kaur_Arteaga_SantaMaria.html') +@app.route("/Johnny_Madison") +def Johnny_Madison(): + + diff --git a/templates/students_2026.html b/templates/students_2026.html index 57964bae..557a66bd 100644 --- a/templates/students_2026.html +++ b/templates/students_2026.html @@ -303,6 +303,10 @@

Summer 2026 Cohort

Johnny and Madison + + + + From 9cd88da8d4f65fd92b9a6c7a1ab1496279620467 Mon Sep 17 00:00:00 2001 From: madisontran16 Date: Mon, 18 May 2026 19:40:45 +0000 Subject: [PATCH 3/3] finalize git workflow lesson --- app.py | 5 ++--- templates/students_2026.html | 14 ++++++++++---- templates/teams/Johnny_Madison.html | 2 +- 3 files changed, 13 insertions(+), 8 deletions(-) diff --git a/app.py b/app.py index c47bd7e5..ad3d7cef 100644 --- a/app.py +++ b/app.py @@ -574,6 +574,5 @@ def Kaur_Arteaga_SantaMaria(): return render_template('teams/Kaur_Arteaga_SantaMaria.html') @app.route("/Johnny_Madison") -def Johnny_Madison(): - - +def Johnny_Madison(); + return render_template ('teams/Johnny_Madison.html') diff --git a/templates/students_2026.html b/templates/students_2026.html index 557a66bd..9682c2c7 100644 --- a/templates/students_2026.html +++ b/templates/students_2026.html @@ -303,10 +303,16 @@

Summer 2026 Cohort

Johnny and Madison - - - - +
+
+ +
+
Madison Tran
+
School: Bellevue College
+

Get more coding experience and connect with my with my mentor and teammate on our open-source project. +

+ Johnny and Madison +
diff --git a/templates/teams/Johnny_Madison.html b/templates/teams/Johnny_Madison.html index 3ae3622c..e2c8d019 100644 --- a/templates/teams/Johnny_Madison.html +++ b/templates/teams/Johnny_Madison.html @@ -7,6 +7,6 @@

Team Johnny and Madison

-

+

networking

\ No newline at end of file