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

update officers, fix term selection button #514

Merged
merged 11 commits into from
Aug 30, 2022
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
4 changes: 4 additions & 0 deletions src/lib/components/about/officer-profile.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,11 @@
$: titleHTML = info.positions[VISIBLE_TERMS[$termIndex]].title
.replace(/Algo\s/, `<b class="acm-purple">Algo&nbsp;</b>`)
.replace(/Create\s/, `<b class="acm-pink">Create&nbsp;</b>`)
.replace(/Design\s/, `<b class="acm-pink">Design&nbsp;</b>`)
.replace(/Dev\s/, `<b class="acm-bluer">Dev&nbsp;</b>`)
.replace(/AI\s/, `<b class="acm-emerald">AI&nbsp;</b>`)
.replace(/Marketing\s/, `<b class="acm-red">Marketing&nbsp;</b>`)
.replace(/Special Events\s/, `<b class="acm-yellow">Special Events&nbsp;</b>`)
.replace(/nodebuds\s/, `<span class="brand-header">Node Buds&nbsp;</span>`);
$: officerTier = dev ? TIERS[info.positions[VISIBLE_TERMS[$termIndex]].tier] : '';
</script>
Expand Down
2 changes: 2 additions & 0 deletions src/lib/components/utils/acm-select.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,8 @@
justify-content: center;
font-size: var(--size-sm);
user-select: none;
text-align: center;
width: 9em;

.option-choice,
.selected {
Expand Down
120 changes: 119 additions & 1 deletion src/lib/constants/officers.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,10 @@
"S22": {
"title": "Algo President",
"tier": 14
},
"F22": {
"title": "Algo Team Lead",
"tier": 14
}
},
"picture": "armanul-ambia.webp"
Expand Down Expand Up @@ -47,6 +51,10 @@
"S22": {
"title": "Algo Officer, nodebuds Officer",
"tier": 15
},
"F22": {
"title": "Algo Officer",
"tier": 15
}
},
"picture": "sami-bajwa.webp"
Expand All @@ -67,6 +75,10 @@
"S22": {
"title": "Create Officer",
"tier": 17
},
"F22": {
"title": "Design Team Lead",
"tier": 17
}
},
"picture": "alan-cortez.webp"
Expand All @@ -85,6 +97,10 @@
"S22": {
"title": "Dev President",
"tier": 20
},
"F22": {
"title": "Marketing Co-Lead",
"tier": 23
}
},
"picture": "wesley-chou.webp"
Expand All @@ -103,6 +119,10 @@
"S22": {
"title": "Webmaster",
"tier": 5
},
"F22": {
"title": "Vice President/Webmaster",
"tier": 2
}
},
"picture": "ethan-davidson.webp"
Expand All @@ -123,6 +143,10 @@
"S22": {
"title": "Dev Project Manager",
"tier": 22
},
"F22": {
"title": "Special Events Officer",
"tier": 25
}
},
"picture": "duc-dinh.webp"
Expand All @@ -143,6 +167,10 @@
"S22": {
"title": "Marketing Director",
"tier": 12
},
"F22": {
"title": "Marketing Co-Lead",
"tier": 23
}
},
"picture": "nurhaliza-hassan.webp"
Expand Down Expand Up @@ -193,6 +221,10 @@
"S22": {
"title": "Dev Officer",
"tier": 21
},
"F22": {
"title": "Algo Officer",
"tier": 15
}
},
"picture": "joel-anil-john.webp"
Expand Down Expand Up @@ -274,7 +306,7 @@
"positions": {
"S22": {
"title": "Historian",
"tier": 13
"tier": 12
}
},
"picture": "nolan-lee.webp"
Expand All @@ -293,6 +325,10 @@
"S22": {
"title": "President, nodebuds Officer",
"tier": 0
},
"F22": {
"title": "Special Events Team Lead",
"tier": 24
}
},
"picture": "aaron-lieberman.webp"
Expand Down Expand Up @@ -327,6 +363,10 @@
"S22": {
"title": "Dev Officer",
"tier": 21
},
"F22": {
"title": "Design Officer",
"tier": 17
}
},
"picture": "jorge-mejia.webp"
Expand Down Expand Up @@ -371,6 +411,10 @@
"S21": {
"title": "President, Create Director, nodebuds Officer",
"tier": 0
},
"F22": {
"title": "Treasurer",
"tier": 4
}
},
"picture": "jacob-nguyen.webp"
Expand Down Expand Up @@ -399,6 +443,10 @@
"S22": {
"title": "Create Project Developer",
"tier": 18
},
"F22": {
"title": "Design Officer",
"tier": 18
}
},
"picture": "kirsten-ochoa.webp"
Expand Down Expand Up @@ -427,6 +475,10 @@
"S22": {
"title": "Event Coordinator",
"tier": 9
},
"F22": {
"title": "Event Coordinator",
"tier": 9
}
},
"picture": "stephanie-pocci.webp"
Expand Down Expand Up @@ -487,6 +539,10 @@
"S22": {
"title": "Algo Officer",
"tier": 15
},
"F22": {
"title": "AI Team Lead",
"tier": 12
}
},
"picture": "justin-stitt.webp"
Expand Down Expand Up @@ -517,6 +573,10 @@
"S22": {
"title": "Dev Project Manager",
"tier": 22
},
"F22": {
"title": "Dev Project Manager",
"tier": 22
}
},
"picture": "daniel-truong.webp"
Expand Down Expand Up @@ -549,6 +609,10 @@
"S22": {
"title": "Vice President",
"tier": 1
},
"F22": {
"title": "President",
"tier": 1
}
},
"picture": "karnikaa-velumani.webp"
Expand All @@ -569,8 +633,62 @@
"S22": {
"title": "Historian",
"tier": 13
},
"F22": {
"title": "Historian",
"tier": 11
}
},
"picture": "jason-wong.webp"
},
{
"fullName": "Alejandro Ramos",
"positions": {
"F22": {
"title": "Design Officer",
"tier": 17
}
},
"picture": "alejandro-ramos.webp"
},
{
"fullName": "Angel Santoyo",
"positions": {
"F22": {
"title": "Dev Officer",
"tier": 21
}
},
"picture": "angel-santoyo.webp"
},
{
"fullName": "Charlie Taylor",
"positions": {
"F22": {
"title": "Dev Team Lead",
"tier": 20
}
},
"picture": "charlie-taylor.webp"
},
{
"fullName": "Yao Lin",
"positions": {
"F22": {
"title": "AI Officer",
"tier": 13
}
},
"picture": "yao-lin.webp"
},
{
"fullName": "Sara Sadek",
"positions": {
"F22": {
"title": "AI Officer",
"tier": 13
}
},
"picture": "placeholder.webp"
}
]
2 changes: 1 addition & 1 deletion src/lib/constants/officers.ts
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ export interface Officer {
};
}

export const VISIBLE_TERMS = [Term.Spring22, Term.Fall21, Term.Spring21];
export const VISIBLE_TERMS = [Term.Fall22, Term.Spring22, Term.Fall21, Term.Spring21];

export const OFFICERS: Officer[] = [...OFFICERS_JSON];

Expand Down
Binary file added static/assets/authors/alejandro-ramos.webp
Binary file not shown.
Binary file added static/assets/authors/angel-santoyo.webp
Binary file not shown.
Binary file modified static/assets/authors/armanul-ambia.webp
Binary file not shown.
Binary file added static/assets/authors/charlie-taylor.webp
Binary file not shown.
Binary file modified static/assets/authors/placeholder.webp
Binary file not shown.
Binary file modified static/assets/authors/sami-bajwa.webp
Binary file not shown.
Binary file added static/assets/authors/yao-lin.webp
Binary file not shown.
7 changes: 7 additions & 0 deletions static/global.css
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
--acm-blue: #2c91c6;
--acm-bluer: #1e6cff;
--acm-emerald: #21d19f;
--acm-yellow: #ffd029;
--acm-dark: #101315;
--acm-gray: #292c2f;
--acm-light: #f8f8f8;
Expand Down Expand Up @@ -72,11 +73,17 @@ body {
.brand-bluer {
color: var(--acm-bluer);
}

.acm-emerald,
.brand-emerald {
color: var(--acm-emerald);
}

.acm-yellow,
.brand-yellow {
color: var(--acm-yellow);
}

.acm-dark,
.brand-dark {
color: var(--acm-dark);
Expand Down