Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

S24 new member data #194

Merged
merged 3 commits into from
Jul 31, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
219 changes: 113 additions & 106 deletions data/members.ts
Original file line number Diff line number Diff line change
Expand Up @@ -127,214 +127,221 @@ const members: PersonInfoProps[] = [
photo: "salma.webp"
},
{
name: "Brandon Tran",
name: "Kevin Wong",
role: "Cyber Academy",
bio: "3rd year Computer Science & Engineering major",
bio: "1st year Undeclared Engineering major",
pronouns: "he/him",
photo: "brandon.webp"
photo: "kevinWong.webp"
},
{
name: "Cindy Ding",
role: "Cyber Academy",
bio: "",
pronouns: "",
photo: ""
},
{
name: "Yashica Prasad",
name: "Jack Maxey",
role: "Cyber Academy",
bio: "1st year Computer Science major",
pronouns: "she/her",
photo: "yashica.webp"
pronouns: "he/him",
photo: ""
},
{
name: "Srishti Ganu",
name: "Saiya Shah",
role: "Cyber Lab",
bio: "1st year Transfer Mathematics of Computation major",
bio: "1st year Computational and Systems Biology major",
pronouns: "she/her",
photo: "srishti.webp"
photo: ""
},
{
name: "Andy Huang",
name: "Asmi Kawatkar",
role: "Cyber Lab",
bio: "3rd year Computer Science major",
pronouns: "he/him",
bio: "2nd year Mathematics of Computation major",
pronouns: "she/her",
photo: ""
},
{
name: "Kevin Zhao",
name: "Pranav Akella",
role: "Psi Beta Rho",
bio: "1st year Computer Science major",
pronouns: "he/him, she/her, they/them",
photo: "kevinZhao.webp"
pronouns: "he/him",
photo: "pranav.webp"
},
{
name: "Iryna Iziumska",
role: "Psi Beta Rho",
bio: "1st year Mathematics/Economics major",
name: "Layah Vigneaud",
role: "Cyber Lab",
bio: "1st year Computer Science major",
pronouns: "she/her",
photo: "iryna.webp"
photo: ""
},
{
name: "Alexander Edwards",
role: "Cyber Academy",
bio: "1st year Transfer Computer Science major",
name: "Jason Jiang",
role: "Cyber Lab",
bio: "1st year Computer Science & Engineering major",
pronouns: "he/him",
photo: "alexanderEdwards.webp"
photo: "jasonJiang.webp"
},
{
name: "Simon Koski",
role: "Psi Beta Rho",
name: "Divik Chotani",
role: "Cyber Lab",
bio: "1st year Computer Science major",
pronouns: "he/him",
photo: ""
},
{
name: "Aditya Pai",
role: "Psi Beta Rho",
bio: "1st year Electrical Engineering major",
pronouns: "he/him",
photo: "aditya.webp"
},
{
name: "Chinmay Devadhar",
name: "Dylan Truong",
role: "Cyber Academy",
bio: "1st year Computer Science major",
pronouns: "he/him",
photo: "chinmay.webp"
photo: "dylan.webp"
},
{
name: "Alan Wu",
role: "Cyber Academy",
bio: "1st year Mathematics of Computation/Statistics major",
name: "Leon Liu",
role: "Cyber Lab",
bio: "1st year Computer Science major",
pronouns: "he/him",
photo: ""
photo: "leonLiu.webp"
},
{
name: "Sanjay Krishna",
name: "Cathleen Qiao",
role: "Cyber Academy",
bio: "1st year Computer Engineering major",
pronouns: "he/him",
photo: ""
},
{
name: "Emma Lin",
role: "Cyber Lab",
bio: "1st year Computer Science & Linguistics major",
bio: "1st year Physics major",
pronouns: "she/her",
photo: ""
},
{
name: "Anthony Fangqing Yu",
role: "Psi Beta Rho",
bio: "2nd year Computer Science major",
pronouns: "he/him",
photo: "anthony.webp"
},
{
name: "Christopher Simaan",
name: "Alexander Edwards",
role: "Cyber Academy",
bio: "1st year Transfer Computer Science & Engineering major",
bio: "1st year Transfer Computer Science major",
pronouns: "he/him",
photo: "christopher.webp"
photo: "alexanderEdwards.webp"
},
{
name: "Kevin Wong",
name: "Hunter Kang",
role: "Cyber Academy",
bio: "1st year Undeclared Engineering major",
bio: "1st year Mathematics of Computation major",
pronouns: "he/him",
photo: "kevinWong.webp"
photo: "hunter.webp"
},
{
name: "Dylan Truong",
name: "Zachary De Soto",
role: "Cyber Academy",
bio: "1st year Computer Science major",
pronouns: "he/him",
photo: "dylan.webp"
bio: "",
pronouns: "",
photo: ""
},
{
name: "Pranav Akella",
name: "Simon Koski",
role: "Psi Beta Rho",
bio: "1st year Computer Science major",
pronouns: "he/him",
photo: "pranav.webp"
photo: ""
},
{
name: "Eddie He",
name: "Daniel Guo",
role: "Cyber Academy",
bio: "1st year Data Theory major",
pronouns: "he/him",
bio: "",
pronouns: "",
photo: ""
},
{
name: "Ryan Chang",
name: "Srishti Ganu",
role: "Cyber Lab",
bio: "1st year Transfer Mathematics of Computation major",
pronouns: "she/her",
photo: "srishti.webp"
},
{
name: "Jonathan Pai",
role: "Cyber Academy",
bio: "1st year Electrical Engineering major",
pronouns: "he/him",
bio: "",
pronouns: "",
photo: ""
},
{
name: "Jessie Chan",
role: "Psi Beta Rho",
name: "Ryan Chang",
role: "Cyber Academy",
bio: "1st year Electrical Engineering major",
pronouns: "she/her",
pronouns: "he/him",
photo: ""
},
{
name: "Justin Morgan",
name: "Andy Huang",
role: "Cyber Lab",
bio: "3rd year Transfer Computer Science major",
bio: "3rd year Computer Science major",
pronouns: "he/him",
photo: "justin.webp"
photo: ""
},
{
name: "Hunter Kang",
role: "Cyber Academy",
bio: "1st year Mathematics of Computation major",
name: "Anthony Fangqing Yu",
role: "Psi Beta Rho",
bio: "2nd year Computer Science major",
pronouns: "he/him",
photo: "hunter.webp"
photo: "anthony.webp"
},
{
name: "Leon Lenk",
name: "Asher Christian",
role: "Cyber Lab",
bio: "2nd year Computer Science major",
bio: "1st year Mathematics of Computation major",
pronouns: "he/him",
photo: "leon.webp"
photo: "asher.webp"
},
{
name: "Jackson Kohls",
role: "Psi Beta Rho",
bio: "Masters of Financial Engineering major",
pronouns: "he/him, they/them",
photo: "jackson.webp"
name: "Teong Seng Tan",
role: "Cyber Lab",
bio: "1st year Computer Science major",
pronouns: "he/him",
photo: ""
},
{
name: "Cameron Monast",
name: "Jishan Kharbanda",
role: "Cyber Academy",
bio: "1st year Transfer Computer Science major",
pronouns: "he/him",
photo: "cameron.webp"
bio: "",
pronouns: "",
photo: ""
},
{
name: "Danniell Xu",
name: "Iryna Iziumska",
role: "Psi Beta Rho",
bio: "1st year Computational and Systems Biology major",
pronouns: "he/him",
photo: "danniell.webp"
bio: "1st year Mathematics/Economics major",
pronouns: "she/her",
photo: "iryna.webp"
},
{
name: "Jason Ni",
name: "Eddie He",
role: "Cyber Academy",
bio: "1st year Mathematics of Comptuation major",
bio: "1st year Data Theory major",
pronouns: "he/him",
photo: ""
},
{
name: "William Shih",
name: "Benjamin Man",
role: "Cyber Lab",
bio: "1st year Computer Science & Linguistics major",
pronouns: "he/him",
photo: ""
},
{
name: "Alexander Hu",
role: "Cyber Academy",
bio: "1st year Mathematics of Computation major",
pronouns: "he/him",
photo: "william.webp"
photo: ""
},
{
name: "Layah Vigneaud",
role: "Cyber Lab",
name: "Kevin Zhao",
role: "Psi Beta Rho",
bio: "1st year Computer Science major",
pronouns: "she/her",
photo: ""
pronouns: "he/him, she/her, they/them",
photo: "kevinZhao.webp"
},
{
name: "Danniell Xu",
role: "Psi Beta Rho",
bio: "1st year Computational and Systems Biology major",
pronouns: "he/him",
photo: "danniell.webp"
}
];

Expand Down
2 changes: 1 addition & 1 deletion data/scripts/check_images.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
old_data = f.read()
old_data_json = json.loads(old_data)
with open('clubdata/membership.tsv','r') as f:
new_extra_data = list(filter(lambda x: "Not found" not in x,[OtherInfo(*i.split('\t')[:22]) for i in f.read().split('\n')[1:]]))
new_extra_data = list(filter(lambda x: "Not found" not in x,[OtherInfo(*i.split('\t')[:19]) for i in f.read().split('\n')[1:]]))
members = []

for member in old_data_json:
Expand Down
12 changes: 6 additions & 6 deletions data/scripts/common.py
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
from typing import NamedTuple

class OtherInfo(NamedTuple):
fields = [f'field{i}' for i in range(22)]
fields[15] = 'name'
fields[16] = 'pronouns'
fields[19] = 'year'
fields[20] = 'major'
fields[21] = 'photo'
fields = [f'field{i}' for i in range(19)]
fields[12] = 'name'
fields[13] = 'pronouns'
fields[16] = 'year'
fields[17] = 'major'
fields[18] = 'photo'
__annotations__ = {field: str for field in fields}

member_template = {
Expand Down
2 changes: 1 addition & 1 deletion data/scripts/compress_images.sh
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
for file in "../../public/images/members"/*.{jpg,png,webp}; do
for file in "../../public/images/members"/*.{jpg,png}; do
if [ -f "$file" ]; then
filename=$(basename -- "$file")
extension="${filename##*.}"
Expand Down
4 changes: 2 additions & 2 deletions data/scripts/update_members.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ class RequirementInfo(NamedTuple):
with open('clubdata/requirement.tsv','r') as f:
new_data = list(filter(lambda x: "#N/A" not in x,[RequirementInfo(*i.split('\t')[:4]) for i in f.read().split('\n')[1:]]))
with open('clubdata/membership.tsv','r') as f:
new_extra_data = list(filter(lambda x: "Not found" not in x,[OtherInfo(*i.split('\t')[:22]) for i in f.read().split('\n')[1:]]))
new_extra_data = list(filter(lambda x: "Not found" not in x,[OtherInfo(*i.split('\t')[:19]) for i in f.read().split('\n')[1:]]))
presidents = []
advisors = []
officers = []
Expand Down Expand Up @@ -84,7 +84,7 @@ def check_member(member_name,member_list):
new_member_json["bio"] = f"{year} {major} major"

members.append(new_member_json)
final_json = presidents + advisors + officers + members
final_json = presidents + officers + advisors + members
print(json.dumps(final_json))

with open('out/data','w') as f:
Expand Down
Binary file added public/images/members/asher.webp
Binary file not shown.
Binary file removed public/images/members/christopher.webp
Binary file not shown.
Binary file added public/images/members/jasonJiang.webp
Binary file not shown.
Binary file added public/images/members/leonLiu.webp
Binary file not shown.
Binary file not shown.