Added myself to the repo

README.md

@@ -21,7 +21,7 @@ This repo serves as an activity for students to practice the common git workflow
 
 After creating your fork of this repository, add an upstream link to the original repo. 
 
-```git remote add upstream https://github.com/computingtalent/GitWorkflowIntro.git```
+```git remote add upstream https://github.com/CTI-CodeDay/GitWorkflowIntro.git```
 
 Create your own feature branch where you will commit your changes
 
@@ -36,6 +36,6 @@ Frequently pull the latest changes from the main branch.
 git checkout main
 git pull upstream main
 git checkout <your_branch_name>
-git rebase main
+git merge main
 ```
 

app.py

@@ -5,5 +5,275 @@
 app = Flask(__name__)
 
 @app.route("/")
-def students():
-    return render_template('students.html')
+def home():
+    return render_template('index.html')
+
+@app.route("/2022")
+def cohort_2022():
+    return render_template('students_2022.html')
+
+@app.route("/2023")
+def cohort_2023():
+    return render_template('students_2023.html')
+
+@app.route("/arm_phil_dyl")
+def team_arm_phil_dyl():
+    return render_template('teams/arm_phil_dyl.html')
+
+@app.route("/2024")
+def cohort_2024():
+    return render_template('students_2024.html')
+
+@app.route("/teamASC")
+def teamASC():
+    return render_template('teams/teamASC.html')
+
+@app.route("/2025")
+def cohort_2025():
+    return render_template('students_2025.html')
+
+@app.route("/shane_rashida_anthony")
+def team_shane_rashida_anthony():
+    return render_template('teams/shane_rashida_anthony.html')
+
+@app.route("/nat_uts")
+def team_nat_uts():
+    return render_template('teams/nat_uts.html')
+
+@app.route("/aryan_ethan_richie")
+def team_aryan_ethan_richie():
+    return render_template('teams/aryan_ethan_richie.html')
+
+@app.route("/sun_edm")
+def team_sun_edm():
+    return render_template('teams/sun_edm.html')
+
+@app.route('/jaime_edgarh')
+def team_jaime_edgarh():
+    return render_template('teams/jaime_edgarh.html')
+
+@app.route("/nathan_brian")
+def team_nathan_brian():
+    return render_template('teams/nathan_brian.html')
+
+@app.route("/boba")
+def team_boba():
+    return render_template('teams/boba.html')
+
+@app.route("/ian_brenden_elias")
+def team_ian_brenden_elias():
+    return render_template('teams/ian_brenden_elias.html')
+
+@app.route("/edg_and_edg")
+def team_edg_and_edg():
+    return render_template('teams/edg_and_edg.html')
+
+@app.route("/nt")
+def team_nt():
+    return render_template('teams/nt.html')
+
+@app.route("/liu_tuan_dominic")
+def team_liu_tuan_dominic():
+    return render_template('teams/liu_tuan_dominic.html')
+
+@app.route("/teamWork")
+def team_june22():
+    return render_template('teams/teamWork.html')
+
+@app.route("/trav_con")
+def team_trav_con():
+    return render_template('teams/trav_con.html')
+
+@app.route("/team_michael_rahul_magiber")
+def team_michael_rahul_magiber():
+    return render_template('teams/team_michael_rahul_magiber.html')
+
+@app.route("/sleeper")
+def team_sleeper():
+    return render_template('teams/sleeper.html')
+
+@app.route("/Team 10")
+def team10():
+    return render_template('teams/team10.html')
+
+@app.route("/team_kn")
+def team_kn():
+    return render_template('teams/team_kn.html')
+
+@app.route("/team_Di_Si_Se")
+def team_Di_Si_Se():
+    return render_template('teams/team_Di_Si_Se.html')
+
+@app.route("/shengzhe")
+def team_shengzhe():
+    return render_template('teams/shengzhe.html')
+
+@app.route("/james_david")
+def team_james_david():
+    return render_template('teams/james_david.html')
+
+@app.route("/dong_zach_dar")
+def team_dong_zach_dar():
+    return render_template('teams/dong_zach_dar.html')
+
+@app.route("/alison_rob_shawn")
+def team_alison_rob_shawn():
+    return render_template('teams/alison_rob_shawn.html')
+
+@app.route("/nick_val")
+def team_nick_val():
+    return render_template('teams/nick_val.html')
+
+@app.route("/luke_noah_maya")
+def team_luke_noah_maya():
+    return render_template('teams/luke_noah_maya.html')
+
+@app.route("/team_28")
+def team_28():
+    return render_template('teams/team_28.html')
+
+@app.route("/team_tony_bryan_julian")
+def team_tony_bryan_julian():
+    return render_template('teams/team_tony_bryan_julian.html')
+
+@app.route("/team_23")
+def team_23():
+    return render_template('teams/team_23.html')
+
+@app.route("/team_7")
+def team_7():
+    return render_template('teams/team_7.html')
+
+@app.route("/team29")
+def team29():
+    return render_template('teams/team29.html')
+
+@app.route("/jesus_tien_jaehoon")
+def team_jesus_tien_jaehoon():
+    return render_template('teams/jesus_tien_jaehoon.html')
+
+@app.route("/team_5")
+def team_5():
+    return render_template('teams/team_5.html')
+
+@app.route("/durle_emily")
+def team_durle_emily():
+    return render_template('teams/durle_emily.html')
+
+@app.route("/chey_serg_ted")
+def team_chey_serg_ted():
+    return render_template('teams/chey_serg_ted.html')
+
+@app.route("/jin_allison_saad")
+def team_jin_allison_saad():
+    return render_template('teams/team_jin_allison_saad.html')
+
+@app.route("/brian_jia_honghao")
+def team_brian_jia_honghao():
+    return render_template('teams/brian_jia_honghao.html')
+
+@app.route("/team_isa_bro_ben")
+def team_isa_bro_ben():
+    return render_template('teams/team_isa_bro_ben.html')
+
+@app.route("/arthur_daniel_adrian")
+def team_arthur_daniel_adrian():
+    return render_template('teams/arthur_daniel_adrian.html')
+
+@app.route("/pramodya_sherman")
+def team_pramodya_sherman():
+    return render_template('teams/pramo_sher.html')
+
+@app.route("/team_CKL")
+def team_chynna_kyongsu_lizzy():
+    return render_template('teams/team_CKL.html')
+
+@app.route("/alex_shawn_chelsy")
+def team_alex_shawn_chelsy():
+    return render_template('teams/alex_shawn_chelsy.html')
+
+@app.route("/team_cesar_daniel_karti")
+def team_cesar_daniel_karti():
+    return render_template('teams/team_cesar_daniel_karti.html')
+
+@app.route("/team_1")
+def team_1():
+   return render_template('teams/team_1.html')
+
+@app.route("/team18")
+def team18():
+    return render_template('teams/team18.html')
+
+@app.route("/evgin_joshiro_michael")
+def team_evgin_joshiro_michael():
+    return render_template('teams/evgin_joshiro_michael.html')
+
+@app.route("/julian_luis_pranathi")
+def team_jlp():
+    return render_template('teams/julian_luis_pranathi.html')
+
+@app.route("/amir_luis_austin")
+def team_amir_luis_austin():
+    return render_template('teams/amir_luis_austin.html')
+
+@app.route("/xiaotian_adrian")
+def team_xiaotian_adrian():
+    return render_template('teams/xiaotian_adrian.html')
+
+@app.route("/team_sydney_ryan_peiwan")
+def team_sydney_ryan_peiwan():
+    return render_template('teams/team_pei-wan.html')
+
+@app.route("/zhao_jiang_lauper")
+def team_zhao_jiang_lauper():
+    return render_template('teams/teamzhao_jiang_lauper.html')
+
+@app.route("/s_o_j")
+def team_s_o_j():
+    return render_template('teams/s_o_j.html')
+
+@app.route("/JIE")
+def team_JIE():
+    return render_template('teams/JIE.html')
+
+@app.route("/xuan_jackson")
+def team_xuan_jackson():
+    return render_template('teams/xuan_jackson.html')
+
+@app.route("/colinsebasaliyah")
+def colinsebasaliyah():
+    return render_template('teams/colinsebasaliyah.html')
+
+@app.route("/team_msj")
+def team_mjs():
+    return render_template('teams/msj.html')
+
+@app.route("/matthew_dale_suchith")
+def matthew_dale_suchith():
+    return render_template('teams/matthew_dale_suchith.html')
+
+@app.route("/tri_sta_jag")
+def team_tri_sta_jag():
+    return render_template('teams/tri_sta_jag.html')
+
+@app.route("/mai_andy_mahdi")
+def team_mai_andy_mahdi():
+    return render_template('teams/mai_andy_mahdi.html')
+
+@app.route("/nic_ridhima_anvi")
+def nic_ridhima_anvi():
+    return render_template('teams/nic_ridhima_anvi.html')
+
+@app.route("/eddie_syn_ved")
+def team_E_S_V():
+    return render_template('teams/eddie_syn_ved.html')
+
+
+@app.route("/abdel_austin_chika")
+def team_abdel_austin_chika():
+    return render_template('teams/abdel_austin_chika.html')
+
+@app.route("/evan_jared_keith_xuan")
+def team_evan_jared_keith_xuan():
+    return render_template('teams/evan_jared_keith_xuan.html')
+

scripts/generator.py

@@ -0,0 +1,19 @@
+import csv
+
+with open('students.csv', 'r') as file:
+    reader = csv.reader(file)
+    next(reader)  # Skip the header
+    with open('output.html', 'w') as outfile:
+        for row in reader:
+            name = row[0]
+            outfile.write(f"""
+<div class="student-container">  
+    <div>
+        <img src="">
+    </div>
+    <div class="student-name">{name}</div>
+    <div> School:  </div>
+    <p> What I'm most looking forward to about the CodeDay Labs internship is ... </p>
+    <a href="">Team page (leave blank until Module 5 when you will be assigned to your teams</a>
+</div>
+            """)