From d85cd1529a7f669f3a4424edd1daf317225f9e9f Mon Sep 17 00:00:00 2001 From: Celina Yang <130410486+celinaky@users.noreply.github.com> Date: Mon, 2 Sep 2024 22:28:55 -0700 Subject: [PATCH] [fa24] Updated 61A and 88C Staff Pages (#7017) * added staff_61a.py file * added staff_88c.py file * Added GUEST_LECTURER role in Role class * Updated staff roles for 61a * added staff info * Changed shm to INSTRUCTOR for 61a * fixed styling and minor issues * changed base_config to use staff_61 * added staff_61a.py file * Added GUEST_LECTURER role in Role class * added staff_88c.py file * added staff info * Updated staff roles for 61a * fixed styling and minor issues * Changed shm to INSTRUCTOR for 61a * changed base_config to use staff_61 * changed info.py to include staff on website * created seperate html for c88c and 61a * test commit to fix module not found error * changed init.py to fix module not found error * added test variable to debug no module found error * Updated instructor pronouns & emails, updated DSA and SPA for tas * attempt tp debug module not found error * try fixing module not found error * combined all staff data into 1 file to fix module not found error * fixed init.py * changed index and base to use 61a staff files, NOT correct wayt to do this since not considering c88c * changed lab assitent and academic interns, NOT correct way to do this as it is only using 61a, work in progress * seperating 61a and c88c staff * trying to fix modulenotfound error * fixing import error * fixing module not found error * removed whitespace * fixed white space error * Changed image path from jpg to jpeg according to their photos * Changed image path from jpg to png accordingly * Updated SPA access for hans and albert * Fixed image paths * Fixed file paths * Updated instructor images for both classes * Added swetha * Added Khadija and Lia * Remove trailing whitespace * removed debugging file, removed empty website links * Changed instructor and staff link to start with semester abbreviation (fa24) --------- Co-authored-by: Celine Tan Co-authored-by: Benji Xu Co-authored-by: Huanzhi (Hans) Mao --- src/main/templates/index.html | 6 +- src/web/data/__init__.py | 1 + src/web/data/info.py | 16 +- src/web/data/staff.py | 546 +++++++++++++++++++++++++++++++-- src/web/models/staff.py | 1 + src/web/templar/base_config.py | 1 + src/web/templates/base.html | 1 + 7 files changed, 531 insertions(+), 41 deletions(-) diff --git a/src/main/templates/index.html b/src/main/templates/index.html index daf4aabc30..b30d2a80fd 100644 --- a/src/main/templates/index.html +++ b/src/main/templates/index.html @@ -7,13 +7,15 @@

{{ course_info.name }}: {{ course_info.title }}

{{ semester }} - Instructor: {% else %} Instructors: {% endif %} - {{ staff.get('instructors', [])|join(", ", attribute="name") }} --> + {{ staff.get('instructors', [])|join(", ", attribute="name") }} + {{ course_info.lecture_times }}

diff --git a/src/web/data/__init__.py b/src/web/data/__init__.py index f8a41b4311..9f6568a594 100644 --- a/src/web/data/__init__.py +++ b/src/web/data/__init__.py @@ -7,6 +7,7 @@ from web.data.staff import ( staff_members ) + from web.data.calendar import ( main_calendar, extra_calendar, diff --git a/src/web/data/info.py b/src/web/data/info.py index a335e1586e..710b5a2da6 100644 --- a/src/web/data/info.py +++ b/src/web/data/info.py @@ -57,10 +57,10 @@ def slide_file_format(slide_format): 'Campus Resources': '/articles/campus-res/', 'Advice from Students': '/articles/advice/', }, - # 'Staff': { - # 'Instructors': '/instructors', - # 'TAs & Tutors': '/staff', - # }, + 'Staff': { + 'Instructors': '/instructor', + 'TAs & Tutors': '/staff', + }, }, }, 'c88c': { @@ -94,10 +94,10 @@ def slide_file_format(slide_format): 'Composition Guide': f'/{semester_abbrev}/articles/composition/', 'Campus Resources': f'/{semester_abbrev}/articles/campus-res/', }, - # 'Staff': { - # 'Instructors': '/instructors', - # 'TAs & Tutors': '/staff', - # }, + 'Staff': { + 'Instructors': f'/{semester_abbrev}/instructor', + 'TAs & Tutors': f'/{semester_abbrev}/staff', + }, }, } }[course] diff --git a/src/web/data/staff.py b/src/web/data/staff.py index a2fe109b36..8b74a03cbd 100644 --- a/src/web/data/staff.py +++ b/src/web/data/staff.py @@ -1,67 +1,551 @@ from web.models.staff import Role from web.models.staff import Staff, github_image +import os -instructors = [ +course = os.environ['COURSE'] + +def sort_access(staff): + if staff.spa and staff.dsp: + return 0 + if staff.spa or staff.dsp: + return 1 + return 2 + +def create_c88c_staff_data(): + instructors = [ Staff( Role.INSTRUCTOR, "John DeNero", - email="", - pronouns=[], + email='denero@berkeley.edu', + pronouns=["he/him/his"], bio="", - image=github_image(""), - website='', + image=github_image("fa24/john-denero.jpg"), ), Staff( Role.INSTRUCTOR, "Jedi Tsang", - email="", - pronouns=[], + email='jedidiahtsang@berkeley.edu', + pronouns=["he/him/his"], bio="", - image=github_image(""), - website='', + image=github_image("fa24/jedi-tsang.jpg"), ), Staff( Role.INSTRUCTOR, "Shm Almeda", - email="", - pronouns=[], + email='shm.almeda@berkeley.edu', + pronouns=["they/them/theirs"], bio="", - image=github_image(""), - website='', + image=github_image("fa24/shm-almeda.jpg"), ), - ] -teaching_assistants = [ + teaching_assistants = [ -] -tutors = [ + Staff(Role.TA, 'Angela Bi', + email='angelabi2003@berkeley.edu', + spa=False, + dsp=False, + pronouns=["she/her/hers"], + bio="Hello! I'm Angela and I'm a junior majoring in Data Science and minoring in Political Economy from the bay area. In my free time, I like illustrating for the Daily Cal, playing volleyball, listening to music, and watching anime. Feel free to reach out and looking forward to a great semester!!", + image=github_image("fa24/angela-bi.png"), + ), + Staff(Role.TA, 'Ethan Yoo', + email='ethanyoo7912@berkeley.edu', + spa=False, + dsp=False, + pronouns=["he/him/his"], + bio="Third-year Applied Mathematics + Computer Science major. The only reason why I'm a math double is so I can avoid taking CS70.", + image=github_image("fa24/ethan-yoo.jpg"), + ), + + Staff(Role.TA, 'Isabelle Ng', + email='isabelle.ng@berkeley.edu', + spa=False, + dsp=False, + pronouns=["she/her/hers"], + bio='Hi I am a junior studying CS, DS, and Music! Excited to meet you all. ', + image=github_image("fa24/isabelle-ng.jpeg"), + ), + + Staff(Role.TA, 'John Teng', + email='johnteng9@berkeley.edu', + spa=False, + dsp=False, + pronouns=["he/him/his"], + bio="Hi, I'm John, a fourth year CS major from Pennsylvania. I like playing video games, soccer, and working out. Looking forward to this semester! ", + image=github_image("fa24/john-teng.jpg"), + ), + + + Staff(Role.TA, 'Michelle Chen', + email='michelle.chenn@berkeley.edu', + spa=False, + dsp=False, + pronouns=["she/her/hers"], + bio='cs+econ junior from singapore. i <3 traveling, eating, snowboarding, photography and my students :D come be my friend!!', + image=github_image("fa24/michelle-chen.jpg"), + ), + + + Staff(Role.TA, 'Ramya Chitturi', + email='ramya.chitturi@berkeley.edu', + spa=False, + dsp=False, + pronouns=["she/her/hers"], + bio="Hi! I'm Ramya, a senior majoring in CS and linguistics. I enjoy sci-fi/fantasy books, crosswords, rock music, museums, and more! Excited to get to know you this semester :)", + image=github_image("fa24/ramya-chitturi.png"), + ), + + Staff(Role.TA, 'Swetha Rajkumar', + email='swetha.rajkumar@berkeley.edu', + spa=False, + dsp=False, + pronouns=["she/her/hers"], + bio="Hi everyone! I’m Swetha, a junior majoring in EECS from the Bay Area. In my free time, I love going on night walks, watching Netflix, and listening to music. Looking forward to an exciting semester, and feel free to reach out with any questions, CS or otherwise :).", + image=github_image("fa24/swetha-rajkumar.jpg"), + ), + + + ] + + tutors = [ + + Staff(Role.TUTOR, 'Andria Xu', + email='andria.xu@berkeley.edu', + pronouns=["she/her/hers"], + bio='', + image=github_image("fa24/andria-xu.jpg"), + ), + + Staff(Role.TUTOR, 'Dhruv Syngol', + email='dhruvsyngol@berkeley.edu', + pronouns=["he/him/his"], + bio="Hi! I'm Dhruv Syngol, and I'm a second year Data Science and Economics student from Chicago. In my free time, I love to go on hiking trips and try new restaurants around the Bay Area, and I've recently been playing a lot of pickleball. Excited to meet you all!", + image=github_image("fa24/dhruv-syngol.jpg"), + ), + + Staff(Role.TUTOR, 'Grace Xie', + email='gracexie@berkeley.edu', + pronouns=["she/her/hers"], + bio="Hello! My name is Grace. I'm a third-year majoring in MCB and Data Science :0 I love reading sci-fi in my free time.", + image=github_image("fa24/grace-xie.jpg"), + ), + + Staff(Role.TUTOR, 'Kenny Wongchamcharoen', + email='pattaraphon.kenny@berkeley.edu', + pronouns=["he/him/his"], + bio="Hey! My name is Kenny and I'm a sophomore majoring in IEOR and Data Science from Singapore & Thailand. I love travelling, hiking, playing tennis and singing (with my acapella group on campus!) Super excited to get to know you all :) it's gonna be a dope semester!", + image=github_image("fa24/kenny-wongchamcharoen.jpg"), + ), + + Staff(Role.TUTOR, 'Khadija Arslan', + email='khadija2002@berkeley.edu', + pronouns=["she/her/hers"], + bio="Hello! I am Khadija and a senior majoring in Data Science and Economics. I am a huge foodie and love exploring restaurants. Excited to meet you all!", + image=github_image("fa24/khadija-arslan.jpg"), + ), + + Staff(Role.TUTOR, 'Lia Fernandez-Grinshpun', + email='liafg@berkeley.edu', + pronouns=["she/her/hers"], + bio="Hi! My name is Lia and I'm a forth year DS & Business major from the Bay. I'm a podcasts junkie, obsessed with matcha in any form, and <3 hiking/running/weightlifting. ", + image=github_image("fa24/lia-fernandez-grinshpun.jpg"), + ), + + Staff(Role.TUTOR, 'Mira Wagner', + email='mirawagner@berkeley.edu', + pronouns=["she/her/hers"], + bio='Hi! I am a sophomore planning to major in data science/statistics and linguistics. I love reading, especially mysteries, swimming and baking! Excited for this semester :)', + image=github_image("fa24/mira-wagner.jpg"), + ), + + ] + + academic_interns = [ + ] + + staff_members = { + "instructors": instructors, + "teaching_assistants": sorted(sorted(teaching_assistants, key=lambda x: x.name), key=sort_access), + "tutors": sorted(sorted(tutors, key=lambda x: x.name), key=sort_access), + "academic_interns": sorted(academic_interns, key=lambda x: x.name), + } + + return staff_members + + +def create_61a_staff_data(): + instructors = [ + + Staff( + Role.INSTRUCTOR, + "John DeNero", + email='denero@berkeley.edu', + pronouns=["he/him/his"], + bio="", + image=github_image("fa24/john-denero.jpg"), + ), + + Staff( + Role.GUEST_LECTURER, + "Jedi Tsang", + email='jedidiahtsang@berkeley.edu', + pronouns=["he/him/his"], + bio="", + image=github_image("fa24/jedi-tsang.jpg"), + ), + + Staff( + Role.INSTRUCTOR, + "Shm Almeda", + email='shm.almeda@berkeley.edu', + pronouns=["they/them/theirs"], + bio="", + image=github_image("fa24/shm-almeda.jpg"), + ), -] -academic_interns = [ ] + teaching_assistants = [ + Staff(Role.TA, 'Albert Wang', + email='awang03@berkeley.edu', + spa=True, + dsp=False, + pronouns=["he/him/his"], + bio='i like pickleball and 61a', + image=github_image("fa24/albert-wang.jpg"), + ), -def sort_access(staff): - if staff.spa and staff.dsp: - return 0 - if staff.spa or staff.dsp: - return 1 - return 2 + Staff(Role.TA, 'Amy Xu', + email='amyxu@berkeley.edu', + spa=True, + dsp=False, + pronouns=["she/her/hers"], + bio="Hi! I'm Amy, a third year from San Diego studying CS & Cogsci. I like to bake, play tennis, and paint cat birthday cards in my free time. This is my fourth semester teaching CS 61A and I'm looking forward to meeting you all! Feel free to reach out :)", + image=github_image("fa24/amy-xu.png"), + ), + + Staff(Role.TA, 'Apollo Loh', + email='apollo.loh@berkeley.edu', + spa=True, + dsp=True, + pronouns=["he/him/his"], + bio="Hi there! I'm Apollo, and I'm a junior studying EECS & Philosophy from Singapore. I've been on the hunt for the best ramen around Berkeley and really enjoy hiking the fire trails. Feel free to reach about transitioning to college life or just about anything!", + image=github_image("fa24/apollo-loh.jpg"), + ), -staff_members = { + Staff(Role.TA, 'Brian Leong', + email='bleong314@berkeley.edu', + spa=False, + dsp=False, + pronouns=["he/him/his"], + bio='Hello! I am a senior transfer student majoring in EECS. I enjoy doing escape rooms and solving all sorts of puzzles (Connections!). I look forward to helping wherever I can, whether it be parking or slaying a hydra! Feel free to reach out if you need anything :)', + image=github_image("fa24/brian-leong.jpg"), + ), + + Staff(Role.TA, 'E Harrison', + email='ehharrison@berkeley.edu', + spa=False, + dsp=False, + pronouns=["he/him/his"], + bio="Hi all! I'm E, and this is my second semester on staff but my first semester as a TA! I'm majoring in EECS, and some things I enjoy are playing the guitar, swimming at the beach, and solving crossword puzzles. I can’t wait to meet all of you and help out this semester :)", + image=github_image("fa24/e-harrison.jpg"), + ), + + Staff(Role.TA, 'Huanzhi (Hans) Mao', + email='huanzhimao@berkeley.edu', + spa=True, + dsp=False, + pronouns=["he/him/his"], + bio='Hello! I’m a senior majoring in CS and Stat. I’m interested in ML agents, distributed systems, cloud computing, and human–computer interaction. I <3 CS 61A! Besides teaching, I enjoy sailing, hiking, and swimming. Looking forward to an awesome semester :o (Generated by ChatGPT)', + image=github_image("fa24/hans-mao.jpg"), + ), + + + Staff(Role.TA, 'Julia Isaac', + email='juliaisaac@berkeley.edu', + spa=False, + dsp=False, + pronouns=[""], + bio="hey! my name is julia and i'm a senior studying cs and minoring in music. this is my fifth semester teaching 61a! some of my hobbies include running, going to vibey concerts, and balling out at rsf 🏀 i also like playing the guitar and am a taro lover 🧋<3", + image=github_image("fa24/julia-isaac.jpg"), + ), + + + Staff(Role.TA, 'Mia Lopez ', + email='mglopez@berkeley.edu', + spa=False, + dsp=False, + pronouns=["she/her/hers"], + bio="❀ hello! My name's Mia and I'm a 3rd year studying CS! I'm into more indie music, like Childish Gambino or TV Girl. My favorite movies are Arrival and Lego Batman, but I also have a thing for Wes Anderson movies! This is my 3rd semester on CS61A staff, so feel free to reach out whenever! ❀", + image=github_image("fa24/mia-lopez.jpg"), + ), + + Staff(Role.TA, 'Priya Venugopal', + email='priyavenugopal@berkeley.edu', + spa=True, + dsp=False, + pronouns=["she/her/hers"], + bio='hi! i’m priya, a fourth-year eecs & econ major from new jersey! i love playing guitar and finding new music to obsess over (pls send me recs). this is my sixth semester teaching 61a, and i’m looking forward to meeting you all :)', + image=github_image("fa24/priya-venugopal.jpg"), + ), + + + Staff(Role.TA, 'Raymond Zhao', + email='raymondzhao@berkeley.edu', + spa=False, + dsp=False, + pronouns=["he/him/his"], + bio='Hi I\'m a junior and I enjoy New Jersey, origami, Berkeley Time, Russell Westbrook, "going to the gym", music, and Lao Gan Ma spicy chili crisp. Excited to meet all of you!!', + image=github_image("fa24/raymond-zhao.jpg"), + ), + + Staff(Role.TA, 'Ritik Sinha', + email='ritiksinha1@berkeley.edu', + spa=False, + dsp=False, + pronouns=["he/him/his"], + bio="Hi! I'm Ritik, a fourth-year studying CS from the bay area. I enjoy playing tennis, am a big OKC Thunder fan, and like finding new spots to eat at! This is my third time on 61A staff - looking forward to another great semester!", + image=github_image("fa24/ritik-sinha.jpg"), + ), + + Staff(Role.TA, 'Sophia Liu', + email='sophiawliu@berkeley.edu', + spa=False, + dsp=False, + pronouns=["she/her/hers"], + bio='Hi! I’m Sophia, a third-year CS major! I love old music and trees! I’ll see ya!', + image=github_image("fa24/sophia-liu.jpg"), + ), + + Staff(Role.TA, 'Veena Sumedh', + email='veena.sumedh@berkeley.edu', + spa=False, + dsp=False, + pronouns=["she/her/hers"], + bio='Hi! I’m Veena, a sophomore studying Computer Science. 61A is such a fascinating and fun class, and I’m so excited for our journey together this semester! Feel free to ask any questions at all :)', + image=github_image("fa24/veena-sumedh.jpg"), + ), + + ] + + tutors = [ + + Staff(Role.TUTOR, 'Allison Lin', + email='allisonlin.r@berkeley.edu', + pronouns=["she/her/hers"], + bio='Hey, I’m Allison! My hobbies are cooking, playing tennis, badminton, and games! Feel free to reach out to me if you need anything :)', + image=github_image("fa24/allison-lin.jpg"), + ), + + Staff(Role.TUTOR, 'Anokhi Shah', + email='anokhi@berkeley.edu', + pronouns=["she/her/hers"], + bio='Hey everyone! I’m Anokhi, a junior studying EECS at Berkeley. I’m from the Bay Area and I enjoy dance, travel, photography, and most importantly trying out new food spots around Berkeley. I’m really excited to be teaching 61A this semester and I look forward to meeting you all!', + image=github_image("fa24/anokhi-shah.jpg"), + ), + + + Staff(Role.TUTOR, 'Benji Xu', + email='benji.xu@berkeley.edu', + pronouns=["he/him/his"], + bio="Hi! I'm Benji, an international student from China/Singapore! In my free time, I luv coding, reading, and hiking! Super excited to teach 61A! Feel free to reach out whenever for wtever! Cheers! :)", + image=github_image("fa24/benji-xu.jpg"), + ), + + + Staff(Role.TUTOR, 'Carolyn Wang', + email='carolynwang.jy@berkeley.edu', + pronouns=["she/her/hers"], + bio="hi! i'm carolyn, a second-year studying cs :) in my free time, i like running, writing, and playing music. talk to me!! i want to help you, and i'm always down for a yapping session <3", + image=github_image("fa24/carolyn-wang.jpg"), + ), + + + Staff(Role.TUTOR, 'Cedric Chan', + email='123bingxichan@berkeley.edu', + pronouns=[""], + bio='i am emerald IV in league of legends', + image=github_image("fa24/cedric-chan.jpg"), + ), + + + Staff(Role.TUTOR, 'Celina Yang', + email='celinay@berkeley.edu', + pronouns=["she/her/hers"], + bio="Hi! I'm Celina, a sophomore studying Data Science. Some of my favorite things are picnics, baking, just dance, and breaking bad/bcs. I loved taking cs 61a and I'm so excited for a great semester with you all! :)", + image=github_image("fa24/celina-yang.jpg"), + ), + + + Staff(Role.TUTOR, 'Celine Tan', + email='celinetan@berkeley.edu', + pronouns=["she/her/hers", "they/them/theirs"], + bio="hi!! i'm celine, a second year from the bay area :) in my free time, i like taking walks, playing with my sister's cat, and baking (i've been told i make a pretty good snickerdoodle)!!", + image=github_image("fa24/celine-tan.jpg"), + ), + + + Staff(Role.TUTOR, 'Chris Dodla', + email='chris.dodla@berkeley.edu', + pronouns=["he/him/his"], + bio='Hey I’m Chris! I’m a sophomore from Toronto majoring in CS + Cog Sci. I love working out, debate, poker, and machine learning. Don’t hesitate to reach out if you need any help or want to talk about anything!', + image=github_image("fa24/chris-dodla.jpeg"), + ), + + Staff(Role.TUTOR, 'Divya Sundar', + email='divya.sundar@berkeley.edu', + pronouns=["she/her/hers"], + bio='Hi! I’m a junior from the Bay Area majoring in CS and cognitive science. In my free time, I enjoy watching Ghibli movies, playing Breath of the Wild, and crocheting. Looking forward to meeting y’all! :D', + image=github_image("fa24/divya-sundar.jpg"), + ), + + + Staff(Role.TUTOR, 'Fathima Shaikh', + email='fathimashaikh318@berkeley.edu', + pronouns=["she/her/hers"], + bio="Hello! I'm Fathima, a second yr EECS major. Besides that, I'm a big runner, writer, and coffee aficionado (@fathimadrinkscoffee). I listen to a lot of EDM and enjoy reading abt cartels/gangs/mafias 😭(SUPER big breaking bad fan) HAHA so excited to meet y'all :)", + image=github_image("fa24/fathima-shaikh.jpg"), + ), + + Staff(Role.TUTOR, 'Jeffery Ren', + email='ren27@berkeley.edu', + pronouns=["he/him/his"], + bio='Hey guys, I’m Jeffery and I am a sophomore majoring in applied math. I love playing chess, listening to music, and having unimportant philosophical conversations. ', + image=github_image("fa24/jeffery-ren.jpg"), + ), + + + Staff(Role.TUTOR, 'Jocelyn Tao', + email='jtao25@berkeley.edu', + pronouns=["she/her/hers"], + bio="hi! i'm a third year cs major from the bay area. i like playing set with friends, karaoke, and eating at mezzo :>", + image=github_image("fa24/jocelyn-tao.jpeg"), + ), + + + Staff(Role.TUTOR, 'Justin Park', + email='justin.s.park@berkeley.edu', + pronouns=[""], + bio="Hi! I'm Justin and I'm a second year from Singapore. I have lived in four countries - US, South Korea, Japan, and Singapore. I enjoy running, hiking, and trying all sorts of interesting food. This is my first time being course staff and I'm excited to make 61A wonderful! Feel free to reach out!", + image=github_image("fa24/justin-park.jpg"), + ), + + + Staff(Role.TUTOR, 'Katie Wang', + email='katiewang@berkeley.edu', + pronouns=["she/her/hers"], + bio="Hi everyone! I'm Katie, a sophomore from San Francisco majoring in EECS and math. In my free time, I like to explore new shops and cafes, listen to and play music, watch kdramas, and read :) Looking forward to teaching 61a this semester!", + image=github_image("fa24/katie-wang.jpg"), + ), + + Staff(Role.TUTOR, 'Lenci Ni', + email='lenci.ni@berkeley.edu', + pronouns=["she/her/hers"], + bio="Hi! I'm Lenci, a junior from Seattle studying EECS. I really enjoyed taking this course and I'm excited for this semester — feel free to reach out :D", + image=github_image("fa24/lenci-ni.jpg"), + ), + + Staff(Role.TUTOR, 'Merrick Zheng', + email='zhengmerrick@berkeley.edu', + pronouns=["he/him/his"], + bio="Hi! I'm Merrick, a third year from St. Louis studying EECS. When I'm not coding, I like to cook, play tennis, and fight my demons in the gym. I'm excited to meet everyone! Feel free to reach out :)\n", + image=github_image("fa24/merrick-zheng.jpg"), + ), + + Staff(Role.TUTOR, 'Nathan Huynh', + email='nathan1nathan@berkeley.edu', + pronouns=["he/him/his"], + bio="What's up everyone! Looking forward to a great semester! Feel free to reach out if you have questions, always happy to help. ( ˶ˆᗜˆ˵ )", + image=github_image("fa24/nathan-huynh.jpg"), + ), + + Staff(Role.TUTOR, 'Nicolas Reed', + email='reednicolas@berkeley.edu', + pronouns=["he/him/his"], + bio="Hey, I'm a sophomore from San Jose majoring in EECS. I enjoy running and playing football/soccer. This class helped me discover my passion for programming and I hope it does the same for you. Feel free to reach out whenever. Let's have a great semester.", + image=github_image("fa24/nicolas-reed.jpg"), + ), + + + Staff(Role.TUTOR, 'Noah Han', + email='noah0427@berkeley.edu', + pronouns=["he/him/his", "they/them/theirs"], + bio="Hi! I'm Noah, a second year CS Major from Los Angeles. I love hanging out with family and friends, solving problems, and climbing. I'm excited to meet you all!", + image=github_image("fa24/noah-han.jpg"), + ), + + + Staff(Role.TUTOR, 'Reema Rafifar', + email='reemarafifar@berkeley.edu', + pronouns=["she/her/hers"], + bio="Hey everyone! I'm Reema, a second-year majoring in Neuroscience. I absolutely love movies so please come talk to me about your favorite films!! I'm excited to get to know you all and I can't wait to get through 61A with you!", + image=github_image("fa24/reema-rafifar.jpg"), + ), + + + Staff(Role.TUTOR, 'Sriya Kalyan', + email='sriyakalyan@berkeley.edu', + pronouns=["she/her/hers"], + bio="hi!! i'm sriya, a second-year eecs major from la! i'm a big fan of pokemon, kpop, and manhwas so feel free to come talk to me about them! i'm excited to work with everyone and have a great semester!", + image=github_image("fa24/sriya-kalyan.jpg"), + ), + + + Staff(Role.TUTOR, 'Sultan Muratbek', + email='sultan.muratbek@berkeley.edu', + pronouns=["he/him/his"], + bio="Hi! I'm Sultan and I'm a sophomore majoring in CS. In my free time, I enjoy swimming, playing soccer, and exploring new cuisines. Looking forward to meeting you all! Feel free to reach out if you have any questions!", + image=github_image("fa24/sultan-muratbek1.jpg"), + ), + + + Staff(Role.TUTOR, 'Susanna Atanessian', + email='susanna_a@berkeley.edu', + pronouns=[""], + bio="Hi! I'm Susanna, a sophomore studying EECS from Armenia. This is my second semester teaching 61a:) I like to spend my free time dancing, filming, traveling, and hiking. I'm super excited to meet you all—don't hesitate to reach out!", + image=github_image("fa24/susanna-atanessian.jpg"), + ), + + Staff(Role.TUTOR, 'Yale Han', + email='y.han@berkeley.edu', + pronouns=["she/her/hers"], + bio='Hey there! I’m Yale, and this is my first semester in course staff. I’m from Fremont, CA, and I’m a junior majoring in CS and minoring in DS. I love thrifting, gymming, and going on day trips! Feel free to reach out about anything :)', + image=github_image("fa24/yale-han.jpg"), + ), + + + Staff(Role.TUTOR, 'Yamuna Rao', + email='y.rao@berkeley.edu', + pronouns=["she/her/hers"], + bio='Hi! I’m Yamuna, and I’m a junior studying EECS. I love dancing, playing guitar, tennis, and going on long walks. Feel free to reach out with any questions :)', + image=github_image("fa24/yamuna-rao.jpg"), + ), + + ] + + academic_interns = [ + ] + + staff_members = { "instructors": instructors, "teaching_assistants": sorted(sorted(teaching_assistants, key=lambda x: x.name), key=sort_access), "tutors": sorted(sorted(tutors, key=lambda x: x.name), key=sort_access), "academic_interns": sorted(academic_interns, key=lambda x: x.name), -} -# the above sorts all of the relevant lists by name, except for heads, who are sorted -# by name and then sorted by role (so that the named roles come first). this is done -# so that specific head TAs can be identified, which helps students send their -# questions to the right place instead of bouncing them from head TA to head TA. + } + return staff_members + + +if course == '61a': + staff_members = create_61a_staff_data() +elif course == 'c88c': + staff_members = create_c88c_staff_data() +else: + raise Exception('No known course: ' + str(course)) + diff --git a/src/web/models/staff.py b/src/web/models/staff.py index 89a40626c4..f118a91a1d 100644 --- a/src/web/models/staff.py +++ b/src/web/models/staff.py @@ -9,6 +9,7 @@ class Role: TA = 'teaching assistant' TUTOR = 'tutor' ACADEMIC_INTERN = 'academic intern' + GUEST_LECTURER = 'guest lecturer' def get_publish_directory(): from templar.cli.templar import parsed_args diff --git a/src/web/templar/base_config.py b/src/web/templar/base_config.py index 48531773d7..a0c720320a 100644 --- a/src/web/templar/base_config.py +++ b/src/web/templar/base_config.py @@ -7,6 +7,7 @@ from web.templar.substitutions import * from web.models.staff import Role + from web.data.staff import staff_members from templar.api.config import ConfigBuilder diff --git a/src/web/templates/base.html b/src/web/templates/base.html index 5e1e11dd37..98c66351de 100644 --- a/src/web/templates/base.html +++ b/src/web/templates/base.html @@ -5,6 +5,7 @@ +