diff --git a/src/app/pages/About/About.js b/src/app/pages/About/About.js
index 12fa35c1..d7ef6282 100644
--- a/src/app/pages/About/About.js
+++ b/src/app/pages/About/About.js
@@ -8,8 +8,8 @@ import { Text } from 'app/components';
import { Section, Space, Icon } from 'app/Symbols.js';
import ALUMNI_BOARD from 'assets/data/alumniBoard.json';
import TESTIMONIALS from 'assets/data/boardTestimonials.json';
-import CURRENT_BOARD from 'assets/data/currentBoard.json';
-import CURRENT_INTERNS from 'assets/data/currentBoardInterns.json';
+import CURRENT_BOARD from 'assets/data/currentBoard.js';
+import CURRENT_INTERNS from 'assets/data/currentBoardInterns.js';
import { Profile } from './components';
import { ReactComponent as LinkArrow } from './link-arrow.svg';
diff --git a/src/app/pages/About/components/Profile/Profile.js b/src/app/pages/About/components/Profile/Profile.js
index 5efed74a..3c2e8bbf 100644
--- a/src/app/pages/About/components/Profile/Profile.js
+++ b/src/app/pages/About/components/Profile/Profile.js
@@ -6,13 +6,7 @@ const Profile = ({ textOnly = false, data }) => (
{!textOnly && (
-
+
)}
diff --git a/src/app/pages/Designathons/Designathon22.js b/src/app/pages/Designathons/Designathon22.js
index 7054a43e..9496a96a 100644
--- a/src/app/pages/Designathons/Designathon22.js
+++ b/src/app/pages/Designathons/Designathon22.js
@@ -7,9 +7,9 @@ import { Section, Space, Icon, Photo } from 'app/Symbols.js';
import { Text } from 'app/components';
import { Judges, Prizes, Rules, SectionNavigation, WinnerShowcase, WorkshopHosts } from './components';
import WINNERS_2022 from 'assets/data/designathon/2022/winners.json'
-import JUDGES_2022 from 'assets/data/designathon/2022/judges.json'
+import JUDGES_2022 from 'assets/data/designathon/2022/judges.js'
import PRIZES_2022 from 'assets/data/designathon/2022/prizes.json';
-import WORKSHOP_HOSTS_2022 from 'assets/data/designathon/2022/workshop-hosts.json';
+import WORKSHOP_HOSTS_2022 from 'assets/data/designathon/2022/workshop-hosts.js';
import RULES_2023 from 'assets/data/designathon/2022/rules.json';
const Designathon22 = () => {
diff --git a/src/app/pages/Designathons/components/Judges/index.jsx b/src/app/pages/Designathons/components/Judges/index.jsx
index fec56143..ef714d6a 100644
--- a/src/app/pages/Designathons/components/Judges/index.jsx
+++ b/src/app/pages/Designathons/components/Judges/index.jsx
@@ -8,10 +8,13 @@ const Judges = ({ profiles }) => {
Judges
- {profiles.map(item => (
-
+ {profiles.map((item) => (
+
{
width: '100%',
position: 'relative',
}}
- />
+ />
{/*
{item.pronouns} */}
{item.name}
{item.role}
diff --git a/src/app/pages/Designathons/components/Workshop/Hosts.jsx b/src/app/pages/Designathons/components/Workshop/Hosts.jsx
index fce557f5..cbe96578 100644
--- a/src/app/pages/Designathons/components/Workshop/Hosts.jsx
+++ b/src/app/pages/Designathons/components/Workshop/Hosts.jsx
@@ -6,9 +6,9 @@ const Hosts = ({ profiles }) => (
Workshop Hosts
{profiles.map(item => (
-
+
(
+const MerchDropListing = ({ name, inStock, buyLink, description, items }) => (
{name}
@@ -40,8 +33,8 @@ const MerchDropListing = ({
- {items.map(item => (
-
+ {items.map((item) => (
+
))}
diff --git a/src/app/pages/Merch/components/MerchItem/MerchItem.js b/src/app/pages/Merch/components/MerchItem/MerchItem.js
index ce08968a..12b2bfc5 100644
--- a/src/app/pages/Merch/components/MerchItem/MerchItem.js
+++ b/src/app/pages/Merch/components/MerchItem/MerchItem.js
@@ -7,14 +7,7 @@ import cn from './MerchItem.module.scss';
const MerchItem = ({ path, ...item }) => (
-
+
{/* Currently not adding the holo effect since it requires some planning to incorporate cleanly. @TODO */}
{/* {item?.type === 'holo' && (
diff --git a/src/assets/data/currentBoard.js b/src/assets/data/currentBoard.js
new file mode 100644
index 00000000..e1ed7ea9
--- /dev/null
+++ b/src/assets/data/currentBoard.js
@@ -0,0 +1,222 @@
+import {
+ headshot_Carly_Chan,
+ headshot_Cinta_Adhiningrat,
+ headshot_Emily_Huynh,
+ headshot_Hannah_Limary,
+ headshot_Isabel_Pham,
+ headshot_Jolin_Huang,
+ headshot_Jorina_Chen,
+ headshot_Karla_Avalos,
+ headshot_Khanh_Tran,
+ headshot_Krey_Daniel,
+ headshot_Kristy_Chung,
+ headshot_Meghna_Kaligotla,
+ headshot_Ryan_Yang,
+ headshot_Sunny_Stetsyuk,
+ headshot_Taesung_Hwang,
+ headshot_Vanna_Vuong,
+ headshot_Vyctoria_Vu,
+ headshot_Yui_Guo,
+ headshot_Zoya_Soy,
+} from 'assets/images/board';
+
+const CURRENT_BOARD = [
+ {
+ name: 'Meghna Kaligotla',
+ position: 'President',
+ photo: headshot_Meghna_Kaligotla,
+ links: [
+ {
+ type: 'linkedin',
+ href: 'https://www.linkedin.com/in/meghna-kaligotla-605/',
+ },
+ ],
+ },
+ {
+ name: 'Carly Chan',
+ position: 'Vice President',
+ photo: headshot_Carly_Chan,
+ links: [
+ {
+ type: 'linkedin',
+ href: 'https://www.linkedin.com/in/carlychan/',
+ },
+ {
+ type: 'website',
+ href: 'https://carlychan.com/',
+ },
+ {
+ type: 'instagram',
+ href: 'https://www.instagram.com/_carlychan_/',
+ },
+ ],
+ },
+ {
+ name: 'Jolin Huang',
+ position: 'Marketing Director',
+ photo: headshot_Jolin_Huang,
+ links: [
+ {
+ type: 'linkedin',
+ href: 'https://www.linkedin.com/in/jolin-huang-30a4451b0/',
+ },
+ {
+ type: 'website',
+ href: 'https://jolinuxui.myportfolio.com',
+ },
+ {
+ type: 'instagram',
+ href: 'https://www.instagram.com/j.huanggg/',
+ },
+ ],
+ },
+ {
+ name: 'Kristy Chung',
+ position: 'Marketing Coordinator',
+ photo: headshot_Kristy_Chung,
+ links: [
+ {
+ type: 'linkedin',
+ href: 'https://www.linkedin.com/in/kristychung1/',
+ },
+ {
+ type: 'instagram',
+ href: 'https://www.instagram.com/kriisty.c/',
+ },
+ ],
+ },
+ {
+ name: 'Vyctoria Vu',
+ position: 'Marketing Coordinator',
+ photo: headshot_Vyctoria_Vu,
+ },
+ {
+ name: 'Emily Huynh',
+ position: 'Marketing Coordinator',
+ photo: headshot_Emily_Huynh,
+ },
+ {
+ name: 'Khanh Tran',
+ position: 'Workshop Coordinator',
+ photo: headshot_Khanh_Tran,
+ links: [],
+ },
+ {
+ name: 'Vanna Vuong',
+ position: 'Industry Outreach Coordinator',
+ photo: headshot_Vanna_Vuong,
+ },
+ {
+ name: 'Cinta Adhiningrat',
+ position: 'Industry Outreach Coordinator',
+ photo: headshot_Cinta_Adhiningrat,
+ links: [],
+ },
+ {
+ name: 'Hannah Limary',
+ position: 'Designathon Director',
+ photo: headshot_Hannah_Limary,
+ links: [
+ {
+ type: 'linkedin',
+ href: 'https://www.linkedin.com/in/hannah-limary',
+ },
+ {
+ type: 'website',
+ href: 'https://hannahlimary.squarespace.com/',
+ },
+ ],
+ },
+ {
+ name: 'Sunny Stetsyuk',
+ position: 'Project Teams Coordinator',
+ photo: headshot_Sunny_Stetsyuk,
+ },
+ {
+ name: 'Jorina Chen',
+ position: 'Project Teams Coordinator',
+ photo: headshot_Jorina_Chen,
+ links: [
+ {
+ type: 'linkedin',
+ href: 'https://www.linkedin.com/in/jorinachen/',
+ },
+ {
+ type: 'website',
+ href: 'https://www.jorinachen.com/',
+ },
+ ],
+ },
+ {
+ name: 'Zoya Soy',
+ position: 'Project Teams Coordinator',
+ photo: headshot_Zoya_Soy,
+ },
+ {
+ name: 'Isabel Pham',
+ position: 'Creative Director',
+ photo: headshot_Isabel_Pham,
+ links: [
+ {
+ type: 'linkedin',
+ href: 'https://www.linkedin.com/in/isabe1pham/',
+ },
+ ],
+ },
+ {
+ name: 'Karla Avalos',
+ position: 'Graphic Designer',
+ photo: headshot_Karla_Avalos,
+ },
+ {
+ name: 'Krey Daniel',
+ position: 'Graphic Designer',
+ photo: headshot_Krey_Daniel,
+ links: [
+ {
+ type: 'instagram',
+ href: 'https://www.instagram.com/in.krey.dible/',
+ },
+ {
+ type: 'linkedin',
+ href: 'https://www.linkedin.com/in/krey-daniel/',
+ },
+ {
+ type: 'website',
+ href: 'https://kreydaniel.wixsite.com/inkreydible',
+ },
+ ],
+ },
+
+ {
+ name: 'Ryan Yang',
+ position: 'Webmaster',
+ photo: headshot_Ryan_Yang,
+ links: [
+ {
+ type: 'instagram',
+ href: 'https://instagram.com/veryfewsbux',
+ },
+ {
+ type: 'linkedin',
+ href: 'https://www.linkedin.com/in/ryanqyang/',
+ },
+ {
+ type: 'website',
+ href: 'https://ryqn.dev',
+ },
+ ],
+ },
+ {
+ name: 'Taesung Hwang',
+ position: 'Webmaster',
+ photo: headshot_Taesung_Hwang,
+ },
+ {
+ name: 'Yui Guo',
+ position: 'Finance Chair',
+ photo: headshot_Yui_Guo,
+ },
+];
+
+export default CURRENT_BOARD;
diff --git a/src/assets/data/currentBoard.json b/src/assets/data/currentBoard.json
deleted file mode 100644
index e0bb3968..00000000
--- a/src/assets/data/currentBoard.json
+++ /dev/null
@@ -1,186 +0,0 @@
-[{
- "name": "Meghna Kaligotla",
- "position": "President",
- "photo": "Meghna_Kaligotla.jpeg",
- "links": [{
- "type": "linkedin",
- "href": "https://www.linkedin.com/in/meghna-kaligotla-605/"
- }]
- },
- {
- "name": "Carly Chan",
- "position": "Vice President",
- "photo": "Carly_Chan.jpg",
- "links": [{
- "type": "linkedin",
- "href": "https://www.linkedin.com/in/carlychan/"
- },
- {
- "type": "website",
- "href": "https://carlychan.com/"
- },
- {
- "type": "instagram",
- "href": "https://www.instagram.com/_carlychan_/"
- }
- ]
- },
- {
- "name": "Jolin Huang",
- "position": "Marketing Director",
- "photo": "Jolin_Huang.png",
- "links": [{
- "type": "linkedin",
- "href": "https://www.linkedin.com/in/jolin-huang-30a4451b0/"
- },
- {
- "type": "website",
- "href": "https://jolinuxui.myportfolio.com"
- },
- {
- "type": "instagram",
- "href": "https://www.instagram.com/j.huanggg/"
- }
- ]
- },
- {
- "name": "Kristy Chung",
- "position": "Marketing Coordinator",
- "photo": "Kristy_Chung.png",
- "links": [{
- "type": "linkedin",
- "href": "https://www.linkedin.com/in/kristychung1/"
- },
- {
- "type": "instagram",
- "href": "https://www.instagram.com/kriisty.c/"
- }
- ]
- },
- {
- "name": "Vyctoria Vu",
- "position": "Marketing Coordinator",
- "photo": "Vyctoria_Vu.jpg"
- },
- {
- "name": "Emily Huynh",
- "position": "Marketing Coordinator",
- "photo": "Emily_Huynh.jpg"
- },
- {
- "name": "Khanh Tran",
- "position": "Workshop Coordinator",
- "photo": "Khanh_Tran.jpg",
- "links": []
- },
- {
- "name": "Vanna Vuong",
- "position": "Industry Outreach Coordinator",
- "photo": "Vanna_Vuong.jpeg"
- },
- {
- "name": "Cinta Adhiningrat",
- "position": "Industry Outreach Coordinator",
- "photo": "Cinta_Adhiningrat.jpg",
- "links": []
- },
- {
- "name": "Hannah Limary",
- "position": "Designathon Director",
- "photo": "Hannah_Limary.jpg",
- "links": [{
- "type": "linkedin",
- "href": "https://www.linkedin.com/in/hannah-limary"
- },
- {
- "type": "website",
- "href": "https://hannahlimary.squarespace.com/"
- }
- ]
- },
- {
- "name": "Sunny Stetsyuk",
- "position": "Project Teams Coordinator",
- "photo": "Sunny_Stetsyuk.jpg"
- },
- {
- "name": "Jorina Chen",
- "position": "Project Teams Coordinator",
- "photo": "Jorina_Chen.jpg",
- "links": [{
- "type": "linkedin",
- "href": "https://www.linkedin.com/in/jorinachen/"
- },
- {
- "type": "website",
- "href": "https://www.jorinachen.com/"
- }
- ]
- },
- {
- "name": "Zoya Soy",
- "position": "Project Teams Coordinator",
- "photo": "Zoya_Soy.jpg"
- },
- {
- "name": "Isabel Pham",
- "position": "Creative Director",
- "photo": "Isabel_Pham.png",
- "links": [{
- "type": "linkedin",
- "href": "https://www.linkedin.com/in/isabe1pham/"
- }]
- },
- {
- "name": "Karla Avalos",
- "position": "Graphic Designer",
- "photo": "Karla_Avalos.jpg"
- },
- {
- "name": "Krey Daniel",
- "position": "Graphic Designer",
- "photo": "Krey_Daniel.jpg",
- "links": [{
- "type": "instagram",
- "href": "https://www.instagram.com/in.krey.dible/"
- },
- {
- "type": "linkedin",
- "href": "https://www.linkedin.com/in/krey-daniel/"
- },
- {
- "type": "website",
- "href": "https://kreydaniel.wixsite.com/inkreydible"
- }
- ]
- },
-
- {
- "name": "Ryan Yang",
- "position": "Webmaster",
- "photo": "Ryan_Yang.jpg",
- "links": [{
- "type": "instagram",
- "href": "https://instagram.com/veryfewsbux"
- },
- {
- "type": "linkedin",
- "href": "https://www.linkedin.com/in/ryanqyang/"
- },
- {
- "type": "website",
- "href": "https://ryqn.dev"
- }
- ]
- },
- {
- "name": "Taesung Hwang",
- "position": "Webmaster",
- "photo": "Taesung_Hwang.jpg"
- },
- {
- "name": "Yui Guo",
- "position": "Finance Chair",
- "photo": "Yui_Guo.JPG"
- }
-]
diff --git a/src/assets/data/currentBoardInterns.js b/src/assets/data/currentBoardInterns.js
new file mode 100644
index 00000000..cec48b02
--- /dev/null
+++ b/src/assets/data/currentBoardInterns.js
@@ -0,0 +1,147 @@
+import {
+ headshot_Adora_Chen,
+ headshot_Brandon_Gumayagay,
+ headshot_Candyce_Pham,
+ headshot_Jessica_Sotelo,
+ headshot_Jin_Kim_Niu,
+ headshot_Kaitlyn_Tran,
+ headshot_Katherine_Park,
+ headshot_Krisha_Konchadi,
+ headshot_Moneer_Ghani,
+ headshot_RosalindGuo,
+ headshot_Samantha_Purganan,
+ headshot_Kaitlen_Ngo,
+} from 'assets/images/board';
+
+const CURRENT_INTERNS = [
+ {
+ name: 'Katherine Park',
+ position: 'Internal',
+ photo: headshot_Katherine_Park,
+ links: [
+ {
+ type: 'linkedin',
+ href: 'https://www.linkedin.com/in/katherine-p-a93a10219',
+ },
+ ],
+ },
+ {
+ name: 'Samantha Purganan',
+ position: 'Internal',
+ photo: headshot_Samantha_Purganan,
+ links: [
+ {
+ type: 'instagram',
+ href: 'https://www.instagram.com/samgmpurg/?hl=en',
+ },
+ ],
+ },
+ {
+ name: 'Adora Chen',
+ position: 'Internal',
+ photo: headshot_Adora_Chen,
+ },
+ {
+ name: 'Jin-Kim Niu',
+ position: 'External',
+ photo: headshot_Jin_Kim_Niu,
+ links: [
+ {
+ type: 'linkedin',
+ href: 'https://www.linkedin.com/in/jin-kim-niu/',
+ },
+ {
+ type: 'website',
+ href: 'https://jinkimniu.myportfolio.com/work',
+ },
+ ],
+ },
+ {
+ name: 'Moneer Ghani',
+ position: 'External',
+ photo: headshot_Moneer_Ghani,
+ links: [
+ {
+ type: 'instagram',
+ href: 'https://www.instagram.com/moneerg/?hl=en',
+ },
+ ],
+ },
+ {
+ name: 'Jessica (Jay) Sotelo',
+ position: 'External',
+ photo: headshot_Jessica_Sotelo,
+ links: [
+ {
+ type: 'linkedin',
+ href: 'http://linkedin.com/in/jessica-sotelo',
+ },
+ ],
+ },
+ {
+ name: 'Candyce Pham',
+ position: 'Design',
+ photo: headshot_Candyce_Pham,
+ links: [
+ {
+ type: 'linkedin',
+ href: 'http://www.linkedin.com/in/candyce-pham',
+ },
+ ],
+ },
+ {
+ name: 'Krisha Konchadi',
+ position: 'Design',
+ photo: headshot_Krisha_Konchadi,
+ },
+ {
+ name: 'Kaitlyn Tran',
+ position: 'Design',
+ photo: headshot_Kaitlyn_Tran,
+ links: [
+ {
+ type: 'instagram',
+ href: 'https://instagram.com/kaitlyn_tranzzz?igshid=YmMyMTA2M2Y=',
+ },
+ {
+ type: 'instagram',
+ href: 'https://instagram.com/noomzster?igshid=YmMyMTA2M2Y=',
+ },
+ ],
+ },
+ {
+ name: 'Brandon Gumayagay',
+ position: 'Developer',
+ photo: headshot_Brandon_Gumayagay,
+ links: [
+ {
+ type: 'linkedin',
+ href: 'https://www.linkedin.com/in/brandon-gumayagay/',
+ },
+ ],
+ },
+ {
+ name: 'Rosalind Guo',
+ position: 'Developer',
+ photo: headshot_RosalindGuo,
+ links: [
+ {
+ type: 'instagram',
+ href: 'https://www.instagram.com/rozguo/',
+ },
+ ],
+ },
+ {
+ name: 'Kaitlen Ngo',
+ position: 'Developer',
+ photo: headshot_Kaitlen_Ngo,
+ links: [
+ {
+ type: 'instagram',
+ href: 'https://www.instagram.com/no.11002012014/',
+ },
+ ],
+ },
+];
+
+export default CURRENT_INTERNS;
diff --git a/src/assets/data/currentBoardInterns.json b/src/assets/data/currentBoardInterns.json
deleted file mode 100644
index b50a8c36..00000000
--- a/src/assets/data/currentBoardInterns.json
+++ /dev/null
@@ -1,111 +0,0 @@
-[{
- "name": "Katherine Park",
- "position": "Internal",
- "photo": "Katherine_Park.jpg",
- "links": [{
- "type": "linkedin",
- "href": "https://www.linkedin.com/in/katherine-p-a93a10219"
- }]
- },
- {
- "name": "Samantha Purganan",
- "position": "Internal",
- "photo": "Samantha_Purganan.jpg",
- "links": [{
- "type": "instagram",
- "href": "https://www.instagram.com/samgmpurg/?hl=en"
- }]
- },
- {
- "name": "Adora Chen",
- "position": "Internal",
- "photo": "Adora_Chen.jpeg"
- },
- {
- "name": "Jin-Kim Niu",
- "position": "External",
- "photo": "Jin_Kim_Niu.jpg",
- "links": [{
- "type": "linkedin",
- "href": "https://www.linkedin.com/in/jin-kim-niu/"
- },
- {
- "type": "website",
- "href": "https://jinkimniu.myportfolio.com/work"
- }
- ]
- },
- {
- "name": "Moneer Ghani",
- "position": "External",
- "photo": "Moneer_Ghani.jpeg",
- "links": [{
- "type": "instagram",
- "href": "https://www.instagram.com/moneerg/?hl=en"
- }]
- },
- {
- "name": "Jessica (Jay) Sotelo",
- "position": "External",
- "photo": "Jessica_Sotelo.jpg",
- "links": [{
- "type": "linkedin",
- "href": "http://linkedin.com/in/jessica-sotelo"
- }]
- },
- {
- "name": "Candyce Pham",
- "position": "Design",
- "photo": "Candyce_Pham.jpg",
- "links": [{
- "type": "linkedin",
- "href": "http://www.linkedin.com/in/candyce-pham"
- }]
- },
- {
- "name": "Krisha Konchadi",
- "position": "Design",
- "photo": "Krisha_Konchadi.jpg"
- },
- {
- "name": "Kaitlyn Tran",
- "position": "Design",
- "photo": "Kaitlyn_Tran.jpg",
- "links": [{
- "type": "instagram",
- "href": "https://instagram.com/kaitlyn_tranzzz?igshid=YmMyMTA2M2Y="
- },
- {
- "type": "instagram",
- "href": "https://instagram.com/noomzster?igshid=YmMyMTA2M2Y="
- }
- ]
- },
- {
- "name": "Brandon Gumayagay",
- "position": "Developer",
- "photo": "Brandon_Gumayagay.jpg",
- "links":[{
- "type": "linkedin",
- "href": "https://www.linkedin.com/in/brandon-gumayagay/"
- }]
- },
- {
- "name": "Rosalind Guo",
- "position": "Developer",
- "photo": "RosalindGuo.jpg",
- "links":[{
- "type": "instagram",
- "href": "https://www.instagram.com/rozguo/"
- }]
- },
- {
- "name": "Kaitlen Ngo",
- "position": "Developer",
- "photo": "kaitlen_ngo.PNG",
- "links":[{
- "type": "instagram",
- "href": "https://www.instagram.com/no.11002012014/"
- }]
- }
-]
diff --git a/src/assets/data/designathon/2022/assets/portrait/index.js b/src/assets/data/designathon/2022/assets/portrait/index.js
new file mode 100644
index 00000000..5dbe4bcc
--- /dev/null
+++ b/src/assets/data/designathon/2022/assets/portrait/index.js
@@ -0,0 +1,13 @@
+export { default as portrait_Alan_Chang } from './Alan_Chang.png';
+export { default as portrait_Evangeline_Gao } from './Evangeline_Gao.png';
+export { default as portrait_Hannah_Limary } from './Hannah_Limary.png';
+export { default as portrait_Jered_Odegard } from './Jered_Odegard.png';
+export { default as portrait_Kailer_Garcia } from './Kailer_Garcia.png';
+export { default as portrait_Katrina_Liu } from './Katrina_Liu.png';
+export { default as portrait_Lillian_Choi } from './Lillian_Choi.png';
+export { default as portrait_Mingjia_Wang } from './Mingjia_Wang.png';
+export { default as portrait_Nathan_Gao } from './Nathan_Gao.png';
+export { default as portrait_Samanvay_Kasarala } from './Samanvay_Kasarala.png';
+export { default as portrait_Vanessa_Wong } from './Vanessa_Wong.png';
+export { default as portrait_Vivian_Lin } from './Vivian_Lin.png';
+export { default as portrait_Vivian_Nguyen } from './Vivian_Nguyen.png';
diff --git a/src/assets/data/designathon/2022/judges.js b/src/assets/data/designathon/2022/judges.js
new file mode 100644
index 00000000..1715c84c
--- /dev/null
+++ b/src/assets/data/designathon/2022/judges.js
@@ -0,0 +1,39 @@
+import {
+ portrait_Jered_Odegard,
+ portrait_Lillian_Choi,
+ portrait_Nathan_Gao,
+ portrait_Vanessa_Wong,
+} from './assets/portrait';
+
+const JUDGES = [
+ {
+ name: 'Lillian Choi',
+ photo: portrait_Lillian_Choi,
+ role: 'UX Designer at Samsung Electronics America',
+ pronouns: 'she/her',
+ about: 'As a recent design graduate from UC Davis, Lillian Choi is a UX Designer based in Silicon Valley and currently working at Samsung Electronics America. As a humble advocate for accessible and equitable designs in the digital healthcare industry, Lillian strives to share her knowledge and passion with junior designers in the community.',
+ },
+ {
+ name: 'Nathan Gao',
+ photo: portrait_Nathan_Gao,
+ role: 'Experience Design Lead at Northwestern Mutual',
+ pronouns: 'he/him',
+ about: 'Nathan Gao is an Experience Design Lead at Northwestern Mutual, where he guides a small team of talented designers in tackling complex projects, helping everyday people navigate difficult life and financial decisions. An avid technologist, music fan, and former operations guy, Nathan is a big believer in using design to shape better complex systems; helping those who have less, live better.',
+ },
+ {
+ name: 'Jered Odegard',
+ photo: portrait_Jered_Odegard,
+ role: 'Coach at Zeal; Former Product Design Leader at Redfin, Expedia',
+ pronouns: 'he/him',
+ about: 'Jered is a career and leadership coach (CPCC, ACC) and former Head of Product Design. He has built world-class product for fortune 500 like 🏝 Expedia and raised design teams from startup to IPO at 🏡 Redfin. He is passionate about giving introverted designers a voice and creative ownership.',
+ },
+ {
+ name: 'Vanessa Wong',
+ photo: portrait_Vanessa_Wong,
+ role: 'Senior Designer @ Accenture Interactive',
+ pronouns: 'she/her',
+ about: 'As a curious visual designer, Vanessa explored agency/in-house/freelance environments and dabbled in diverse industries across education, consumer products, e-commerce, tech, public services, fashion/lifestyle, and entertainment. With her passion for education, she also co-founded an educational nonprofit called Menti during the pandemic to help young adults access learning resources.',
+ },
+];
+
+export default JUDGES;
diff --git a/src/assets/data/designathon/2022/judges.json b/src/assets/data/designathon/2022/judges.json
deleted file mode 100644
index 7b4a9f33..00000000
--- a/src/assets/data/designathon/2022/judges.json
+++ /dev/null
@@ -1,29 +0,0 @@
-[{
- "name": "Lillian Choi",
- "photo": "data/designathon/2022/assets/portrait/Lillian_Choi.png",
- "role": "UX Designer at Samsung Electronics America",
- "pronouns": "she/her",
- "about": "As a recent design graduate from UC Davis, Lillian Choi is a UX Designer based in Silicon Valley and currently working at Samsung Electronics America. As a humble advocate for accessible and equitable designs in the digital healthcare industry, Lillian strives to share her knowledge and passion with junior designers in the community."
- },
- {
- "name": "Nathan Gao",
- "photo": "data/designathon/2022/assets/portrait/Nathan_Gao.png",
- "role": "Experience Design Lead at Northwestern Mutual",
- "pronouns": "he/him",
- "about": "Nathan Gao is an Experience Design Lead at Northwestern Mutual, where he guides a small team of talented designers in tackling complex projects, helping everyday people navigate difficult life and financial decisions. An avid technologist, music fan, and former operations guy, Nathan is a big believer in using design to shape better complex systems; helping those who have less, live better."
- },
- {
- "name": "Jered Odegard",
- "photo": "data/designathon/2022/assets/portrait/Jered_Odegard.png",
- "role": "Coach at Zeal; Former Product Design Leader at Redfin, Expedia",
- "pronouns": "he/him",
- "about": "Jered is a career and leadership coach (CPCC, ACC) and former Head of Product Design. He has built world-class product for fortune 500 like 🏝 Expedia and raised design teams from startup to IPO at 🏡 Redfin. He is passionate about giving introverted designers a voice and creative ownership."
- },
- {
- "name": "Vanessa Wong",
- "photo": "data/designathon/2022/assets/portrait/Vanessa_Wong.png",
- "role": "Senior Designer @ Accenture Interactive",
- "pronouns": "she/her",
- "about": "As a curious visual designer, Vanessa explored agency/in-house/freelance environments and dabbled in diverse industries across education, consumer products, e-commerce, tech, public services, fashion/lifestyle, and entertainment. With her passion for education, she also co-founded an educational nonprofit called Menti during the pandemic to help young adults access learning resources."
- }
-]
\ No newline at end of file
diff --git a/src/assets/data/designathon/2022/workshop-hosts.js b/src/assets/data/designathon/2022/workshop-hosts.js
new file mode 100644
index 00000000..5fbdfc41
--- /dev/null
+++ b/src/assets/data/designathon/2022/workshop-hosts.js
@@ -0,0 +1,55 @@
+import {
+ portrait_Alan_Chang,
+ portrait_Evangeline_Gao,
+ portrait_Hannah_Limary,
+ portrait_Katrina_Liu,
+ portrait_Mingjia_Wang,
+ portrait_Samanvay_Kasarala,
+} from './assets/portrait';
+
+const WORKSHOP_HOSTS = [
+ {
+ name: 'Katrina Liu',
+ photo: portrait_Katrina_Liu,
+ role: 'Senior UX Designer at Microsoft',
+ pronouns: 'she/her',
+ about: ' I am Katrina, a UX leader with 15+ years of experience in the field. I am a Senior UX Designer at Microsoft by day, UX community leader by night. As the North America Director for Ladies that UX, I provide guidance and support for over 20 chapters in the North America region to put together events and connect talented UX professionals across different levels.',
+ },
+ {
+ name: 'Samanvay Kasarala',
+ photo: portrait_Samanvay_Kasarala,
+ role: 'UX designer at Reonomy',
+ pronouns: 'he/him',
+ about: 'Fun Fact: I designed a Tory Burch flagship store in Tokyo And that’s when I decided to quit being an architect and switch into UX.',
+ },
+ {
+ name: 'Mingjia Wang',
+ photo: portrait_Mingjia_Wang,
+ role: 'Executive Advisor @ Commit the Change',
+ pronouns: 'he/him',
+ about: '',
+ },
+ {
+ name: 'Alan Chang',
+ photo: portrait_Alan_Chang,
+ role: 'VP of Outreach @ Commit the Change',
+ pronouns: 'he/him',
+ about: '',
+ },
+ {
+ name: 'Hannah Limary',
+ photo: portrait_Hannah_Limary,
+ role: 'UX Design Intern @ Amazon',
+ pronouns: 'she/her',
+ about: 'Fun Fact: She is the design at UCI 2022 president!',
+ },
+ {
+ name: 'Evangeline Gao',
+ photo: portrait_Evangeline_Gao,
+ role: 'Vice President @ Design at UCI',
+ pronouns: 'she/her',
+ about: '',
+ },
+];
+
+export default WORKSHOP_HOSTS;
diff --git a/src/assets/data/designathon/2022/workshop-hosts.json b/src/assets/data/designathon/2022/workshop-hosts.json
deleted file mode 100644
index f6a6d587..00000000
--- a/src/assets/data/designathon/2022/workshop-hosts.json
+++ /dev/null
@@ -1,43 +0,0 @@
-[{
- "name": "Katrina Liu",
- "photo": "data/designathon/2022/assets/portrait/Katrina_Liu.png",
- "role": "Senior UX Designer at Microsoft",
- "pronouns": "she/her",
- "about": " I am Katrina, a UX leader with 15+ years of experience in the field. I am a Senior UX Designer at Microsoft by day, UX community leader by night. As the North America Director for Ladies that UX, I provide guidance and support for over 20 chapters in the North America region to put together events and connect talented UX professionals across different levels."
- },
- {
- "name": "Samanvay Kasarala",
- "photo": "data/designathon/2022/assets/portrait/Samanvay_Kasarala.png",
- "role": "UX designer at Reonomy",
- "pronouns": "he/him",
- "about": "Fun Fact: I designed a Tory Burch flagship store in Tokyo And that’s when I decided to quit being an architect and switch into UX."
- },
- {
- "name": "Mingjia Wang",
- "photo": "data/designathon/2022/assets/portrait/Mingjia_Wang.png",
- "role": "Executive Advisor @ Commit the Change",
- "pronouns": "he/him",
- "about": ""
- },
- {
- "name": "Alan Chang",
- "photo": "data/designathon/2022/assets/portrait/Alan_Chang.png",
- "role": "VP of Outreach @ Commit the Change",
- "pronouns": "he/him",
- "about": ""
- },
- {
- "name": "Hannah Limary",
- "photo": "data/designathon/2022/assets/portrait/Hannah_Limary.png",
- "role": "UX Design Intern @ Amazon",
- "pronouns": "she/her",
- "about": "Fun Fact: She is the design at UCI 2022 president!"
- },
- {
- "name": "Evangeline Gao",
- "photo": "data/designathon/2022/assets/portrait/Evangeline_Gao.png",
- "role": "Vice President @ Design at UCI",
- "pronouns": "she/her",
- "about": ""
- }
-]
diff --git a/src/assets/data/merchList.js b/src/assets/data/merchList.js
new file mode 100644
index 00000000..cf831cef
--- /dev/null
+++ b/src/assets/data/merchList.js
@@ -0,0 +1,123 @@
+import {
+ merch_sticker_boba,
+ merch_sticker_bobaeater,
+ merch_sticker_designIsMyPassion,
+ merch_sticker_frozenEater,
+ merch_sticker_penTool,
+ merch_sticker_rainbowHeartPenTool,
+ merch_sticker_uc_irvine,
+ merch_shirt_embroidered,
+ merch_shirt_longSleeved,
+ merch_sticker_f20_heart,
+ merch_sticker_f20_boba,
+} from 'assets/images/merch';
+
+const MERCH_LIST = [
+ {
+ name: 'Winter 2023 Merch',
+ description:
+ "Unisex, ultra-cotton black shirts by Gildan with a screen-printed 'design' and thick, durable 2 in. x 2 in. vinyl stickers.",
+ inStock: true,
+ buyLink: 'https://forms.gle/TJNv9zixcZehMBXq5',
+ items: [
+ {
+ name: 'Long-Sleeved DAUCI Shirt',
+ price: 22,
+ photo: merch_shirt_longSleeved,
+ },
+ {
+ name: 'Bobaeater',
+ price: 3,
+ photo: merch_sticker_bobaeater,
+ },
+ {
+ name: 'DAUCI is My Passion',
+ price: 3,
+ photo: merch_sticker_designIsMyPassion,
+ },
+ ],
+ },
+ {
+ name: 'Spring 2022 Merch',
+ path: 'spring-2022',
+ description:
+ 'Embroidered unisex shirts and high quality, weather-proof vinyl items with exclusive, original designs.',
+ inStock: false,
+ items: [
+ {
+ name: 'UC Irvine Embroidered T-Shirt',
+ price: 30,
+ note: {
+ type: 'link',
+ href: '/shirt22',
+ content: 'View Shirt',
+ },
+ photo: merch_shirt_embroidered,
+ },
+ {
+ name: '"uc irvine sticker"',
+ price: 3.5,
+ photo: merch_sticker_uc_irvine,
+ },
+ {
+ name: 'Rainbow Heart Pen Tool',
+ price: 3.5,
+ photo: merch_sticker_rainbowHeartPenTool,
+ },
+ ],
+ },
+ {
+ name: 'Fall-Winter 2021 Stickers',
+ path: 'fall-winter-2021',
+ description:
+ 'High quality, weather-proof vinyl items with exclusive, original designs. Approximately 3x3 inches.',
+ inStock: false,
+ items: [
+ {
+ note: 'Holographic',
+ name: 'Chill Out',
+ photo: merch_sticker_frozenEater,
+ },
+ {
+ name: 'Bobaeater',
+ price: 3,
+ photo: merch_sticker_bobaeater,
+ },
+ {
+ name: 'Design is My Passion',
+ price: 3,
+ photo: merch_sticker_designIsMyPassion,
+ },
+ {
+ name: 'D@UCI Boba',
+ price: 3,
+ photo: merch_sticker_boba,
+ },
+ ],
+ },
+ {
+ name: '2020 Stickers',
+ path: 'fall-2020',
+ description: '',
+ inStock: false,
+ items: [
+ {
+ name: 'I Heart Design',
+ price: 3,
+ photo: merch_sticker_f20_heart,
+ },
+ {
+ name: 'Pen Tool',
+ price: 3,
+ photo: merch_sticker_penTool,
+ },
+ {
+ name: 'Boba',
+ price: 3,
+ photo: merch_sticker_f20_boba,
+ },
+ ],
+ },
+];
+
+export default MERCH_LIST;
diff --git a/src/assets/data/merchList.json b/src/assets/data/merchList.json
deleted file mode 100644
index 10ab8353..00000000
--- a/src/assets/data/merchList.json
+++ /dev/null
@@ -1,102 +0,0 @@
-[
- {
- "name": "Winter 2023 Merch",
- "path": "winter-2023",
- "description": "Unisex, ultra-cotton black shirts by Gildan with a screen-printed 'design' and thick, durable 2 in. x 2 in. vinyl stickers.",
- "inStock": true,
- "buyLink": "https://forms.gle/TJNv9zixcZehMBXq5",
- "items": [
- {
- "name": "Long-Sleeved DAUCI Shirt",
- "price": 22,
- "photo": "shirt.png"
- },
- {
- "name": "Bobaeater",
- "price": 3,
- "photo": "bobaeater.png"
- },
- {
- "name": "DAUCI is My Passion",
- "price": 3,
- "photo": "passion.png"
- }
- ]
- },
- {
- "name": "Spring 2022 Merch",
- "path": "spring-2022",
- "description": "Embroidered unisex shirts and high quality, weather-proof vinyl items with exclusive, original designs.",
- "inStock": false,
- "items": [{
- "name": "UC Irvine Embroidered T-Shirt",
- "price": 30,
- "note": {
- "type": "link",
- "href": "/shirt22",
- "content": "View Shirt"
- },
- "photo": "shirt.png"
- },
- {
- "name": "\"uc irvine sticker\"",
- "price": 3.5,
- "photo": "ucirvine.svg"
- },
- {
- "name": "Rainbow Heart Pen Tool",
- "price": 3.5,
- "photo": "heart.svg"
- }
- ]
- },
- {
- "name": "Fall-Winter 2021 Stickers",
- "path": "fall-winter-2021",
- "description": "High quality, weather-proof vinyl items with exclusive, original designs. Approximately 3x3 inches.",
- "inStock": false,
- "items": [{
- "note": "Holographic",
- "name": "Chill Out",
- "photo": "frozen-eater.png"
- },
- {
- "name": "Bobaeater",
- "price": 3,
- "photo": "bobaeater.png"
- },
- {
- "name": "Design is My Passion",
- "price": 3,
- "photo": "passion.png"
- },
- {
- "name": "D@UCI Boba",
- "price": 3,
- "photo": "boba.png"
- }
- ]
- },
- {
- "name": "2020 Stickers",
- "path": "fall-2020",
- "description": "",
- "inStock": false,
- "items": [{
- "name": "I Heart Design",
- "price": 3,
- "photo": "heart.svg"
- },
- {
- "name": "Pen Tool",
- "price": 3,
- "photo": "pentool.svg"
- },
- {
- "name": "Boba",
- "price": 3,
- "photo": "boba.svg"
- }
- ]
- }
-]
diff --git a/src/assets/images/board/index.js b/src/assets/images/board/index.js
new file mode 100644
index 00000000..e8420ae9
--- /dev/null
+++ b/src/assets/images/board/index.js
@@ -0,0 +1,31 @@
+export { default as headshot_Adora_Chen } from './current/Adora_Chen.jpeg';
+export { default as headshot_Brandon_Gumayagay } from './current/Brandon_Gumayagay.jpg';
+export { default as headshot_Candyce_Pham } from './current/Candyce_Pham.jpg';
+export { default as headshot_Carly_Chan } from './current/Carly_Chan.jpg';
+export { default as headshot_Cinta_Adhiningrat } from './current/Cinta_Adhiningrat.jpg';
+export { default as headshot_Emily_Huynh } from './current/Emily_Huynh.jpg';
+export { default as headshot_Hannah_Limary } from './current/Hannah_Limary.jpg';
+export { default as headshot_Isabel_Pham } from './current/Isabel_Pham.png';
+export { default as headshot_Jessica_Sotelo } from './current/Jessica_Sotelo.jpg';
+export { default as headshot_Jin_Kim_Niu } from './current/Jin_Kim_Niu.jpg';
+export { default as headshot_Jolin_Huang } from './current/Jolin_Huang.png';
+export { default as headshot_Jorina_Chen } from './current/Jorina_Chen.jpg';
+export { default as headshot_Kaitlyn_Tran } from './current/Kaitlyn_Tran.jpg';
+export { default as headshot_Karla_Avalos } from './current/Karla_Avalos.jpg';
+export { default as headshot_Katherine_Park } from './current/Katherine_Park.jpg';
+export { default as headshot_Khanh_Tran } from './current/Khanh_Tran.jpg';
+export { default as headshot_Krey_Daniel } from './current/Krey_Daniel.jpg';
+export { default as headshot_Krisha_Konchadi } from './current/Krisha_Konchadi.jpg';
+export { default as headshot_Kristy_Chung } from './current/Kristy_Chung.png';
+export { default as headshot_Meghna_Kaligotla } from './current/Meghna_Kaligotla.jpeg';
+export { default as headshot_Moneer_Ghani } from './current/Moneer_Ghani.jpeg';
+export { default as headshot_RosalindGuo } from './current/RosalindGuo.jpg';
+export { default as headshot_Ryan_Yang } from './current/Ryan_Yang.jpg';
+export { default as headshot_Samantha_Purganan } from './current/Samantha_Purganan.jpg';
+export { default as headshot_Sunny_Stetsyuk } from './current/Sunny_Stetsyuk.jpg';
+export { default as headshot_Taesung_Hwang } from './current/Taesung_Hwang.jpg';
+export { default as headshot_Vanna_Vuong } from './current/Vanna_Vuong.jpeg';
+export { default as headshot_Vyctoria_Vu } from './current/Vyctoria_Vu.jpg';
+export { default as headshot_Yui_Guo } from './current/Yui_Guo.JPG';
+export { default as headshot_Zoya_Soy } from './current/Zoya_Soy.jpg';
+export { default as headshot_Kaitlen_Ngo } from './current/kaitlen_ngo.PNG';
diff --git a/src/assets/images/merch/index.js b/src/assets/images/merch/index.js
new file mode 100644
index 00000000..436cb769
--- /dev/null
+++ b/src/assets/images/merch/index.js
@@ -0,0 +1,13 @@
+export { default as merch_sticker_boba } from './stickers/boba.png';
+export { default as merch_sticker_bobaeater } from './stickers/bobaeater.png';
+export { default as merch_sticker_designIsMyPassion } from './stickers/design-is-my-passion.png';
+export { default as merch_sticker_frozenEater } from './stickers/frozen-eater.png';
+export { default as merch_sticker_penTool } from './stickers/pen-tool.svg';
+export { default as merch_sticker_rainbowHeartPenTool } from './stickers/rainbow-heart-pen-tool.svg';
+export { default as merch_sticker_uc_irvine } from './stickers/uc-irvine.svg';
+
+export { default as merch_shirt_embroidered } from './shirts/embroidered-uc-irvine-shirt.png';
+export { default as merch_shirt_longSleeved } from './shirts/long-sleeved-design-shirt.png';
+
+export { default as merch_sticker_f20_boba } from './stickers/boba-flat.svg';
+export { default as merch_sticker_f20_heart } from './stickers/heart-design-pink.svg';
diff --git a/src/assets/images/merch/spring-2022/shirt.png b/src/assets/images/merch/shirts/embroidered-uc-irvine-shirt.png
similarity index 100%
rename from src/assets/images/merch/spring-2022/shirt.png
rename to src/assets/images/merch/shirts/embroidered-uc-irvine-shirt.png
diff --git a/src/assets/images/merch/winter-2023/shirt.png b/src/assets/images/merch/shirts/long-sleeved-design-shirt.png
similarity index 100%
rename from src/assets/images/merch/winter-2023/shirt.png
rename to src/assets/images/merch/shirts/long-sleeved-design-shirt.png
diff --git a/src/assets/images/merch/fall-2020/boba.svg b/src/assets/images/merch/stickers/boba-flat.svg
similarity index 100%
rename from src/assets/images/merch/fall-2020/boba.svg
rename to src/assets/images/merch/stickers/boba-flat.svg
diff --git a/src/assets/images/merch/fall-winter-2021/boba.png b/src/assets/images/merch/stickers/boba.png
similarity index 100%
rename from src/assets/images/merch/fall-winter-2021/boba.png
rename to src/assets/images/merch/stickers/boba.png
diff --git a/src/assets/images/merch/fall-winter-2021/bobaeater.png b/src/assets/images/merch/stickers/bobaeater.png
similarity index 100%
rename from src/assets/images/merch/fall-winter-2021/bobaeater.png
rename to src/assets/images/merch/stickers/bobaeater.png
diff --git a/src/assets/images/merch/fall-winter-2021/passion.png b/src/assets/images/merch/stickers/design-is-my-passion.png
similarity index 100%
rename from src/assets/images/merch/fall-winter-2021/passion.png
rename to src/assets/images/merch/stickers/design-is-my-passion.png
diff --git a/src/assets/images/merch/fall-winter-2021/frozen-eater.png b/src/assets/images/merch/stickers/frozen-eater.png
similarity index 100%
rename from src/assets/images/merch/fall-winter-2021/frozen-eater.png
rename to src/assets/images/merch/stickers/frozen-eater.png
diff --git a/src/assets/images/merch/fall-2020/heart.svg b/src/assets/images/merch/stickers/heart-design-pink.svg
similarity index 100%
rename from src/assets/images/merch/fall-2020/heart.svg
rename to src/assets/images/merch/stickers/heart-design-pink.svg
diff --git a/src/assets/images/merch/fall-2020/pentool.svg b/src/assets/images/merch/stickers/pen-tool.svg
similarity index 100%
rename from src/assets/images/merch/fall-2020/pentool.svg
rename to src/assets/images/merch/stickers/pen-tool.svg
diff --git a/src/assets/images/merch/spring-2022/heart.svg b/src/assets/images/merch/stickers/rainbow-heart-pen-tool.svg
similarity index 100%
rename from src/assets/images/merch/spring-2022/heart.svg
rename to src/assets/images/merch/stickers/rainbow-heart-pen-tool.svg
diff --git a/src/assets/images/merch/spring-2022/ucirvine.svg b/src/assets/images/merch/stickers/uc-irvine.svg
similarity index 100%
rename from src/assets/images/merch/spring-2022/ucirvine.svg
rename to src/assets/images/merch/stickers/uc-irvine.svg
diff --git a/src/assets/images/merch/winter-2023/bobaeater.png b/src/assets/images/merch/winter-2023/bobaeater.png
deleted file mode 100644
index 04b42935..00000000
Binary files a/src/assets/images/merch/winter-2023/bobaeater.png and /dev/null differ
diff --git a/src/assets/images/merch/winter-2023/passion.png b/src/assets/images/merch/winter-2023/passion.png
deleted file mode 100644
index ef42e232..00000000
Binary files a/src/assets/images/merch/winter-2023/passion.png and /dev/null differ