Merge pull request #1 from ssbdragonfly/main

Updated team members, updated faq for 12.0

Author: Leahie

src/eventdata/FAQComponents/FAQDeadline.svelte

@@ -4,13 +4,13 @@
 
 <p>
 	Registration for participants, volunteers, mentors, judges, workshop hosts, and photographers
-	opens on {registration.participant.open.format('dddd, MMMM D [at] h:mm a')}.
+	opens on 
+	<strong>NOT DECIDED FOR HACK TJ 12.0 YET</strong> .
 </p>
 
 <p class="mt-2">
-	Registration for participants closes on <span class="font-bold"
-		>{registration.participant.close.format('dddd, MMMM D [at] h:mm a')}</span
-	>—this is a hard deadline; we do not accept submissions after this time.
+	Registration for participants closes on 
+	<strong>NOT DECIDED FOR HACK TJ 12.0 YET</strong> — will be a hard deadline; we do not accept submissions after this time.
 </p>
 <p class="mt-2">
 	Judges, mentors, and volunteers will be able to register until the start of the event.

src/eventdata/FAQComponents/FAQPrizes.svelte

@@ -12,5 +12,5 @@
 
 <p>
 	Major League Hacking and some of our partners also host their own Sponsored Prizes, which you can
-	explore when the 11.0 Student Guide goes live.
+	explore when the 12.0 Student Guide goes live.
 </p>

src/eventdata/FAQComponents/FAQRegister.svelte

@@ -4,7 +4,7 @@
 
 <ol class="list-decimal">
 	<li>
-		On {registration.participant.open.format('dddd, MMMM D [at] h:mm a')}, a button will appear at
+		On <strong>NOT DECIDED FOR HACK TJ 12.0 YET</strong>, a button will appear at
 		the top of this site. Click it.
 	</li>
 	<li class="mt-2">You will be redirected to a page where you can click the appropriate form.</li>

src/eventdata/FAQComponents/FAQWhen.svelte

@@ -3,7 +3,5 @@
 </script>
 
 <p>
-	HackTJ will start on {event.start.format('dddd, MMMM D')} and run until {event.end.format(
-		'dddd, MMMM D'
-	)}.
+	<strong>Please note that the exact dates for HackTJ 12.0 are not yet finalized.</strong>
 </p>

src/eventdata/faq.js

@@ -59,6 +59,6 @@ export default [
 	{
 		question: 'How are ticket decisions made?',
 		answer:
-			'Tickets decisions are made based on a variety of factors, including the registration time. Sign up quickly to increase the chance that you are given a HackTJ 11.0 ticket!'
+			'Tickets decisions are made based on a variety of factors, including the registration time. Sign up quickly to increase the chance that you are given a HackTJ 12.0 ticket!'
 	}
 ];

src/eventdata/teamMembers.js

@@ -6,143 +6,157 @@ import { base } from '$app/paths';
 
 let teamMembers = [
 	{
-		name: 'Ananya Pamal',
-		class: '2024',
+		name: 'Samvrit Rao',
+		class: '2025',
 		years: 3,
 		director: true,
 		description:
-			'As a senior, Ananya is excited to be the Director of HackTJ 11.0! This is her third (and a half) year being on the HackTJ team, and she enjoys computer science and physics. She is fascinated by machine learning and its applications in data analysis. Outside of HackTJ, Ananya participates in clubs/programs such as FTC, Spanish Honor Society, and UAV. In her free time, she likes to bake, listen to music, and do pilates.',
-		portraitSrc: `${base}/teamportraits/Ananya.JPG`
+			'Samvrit is a junior at TJHSST and this is his second year on the HackTJ team and he joined after competing in freshman year. He is passionate about the intersection of computer science and biology and likes to pursue translational projects related to infectious and neurological diseases. Along with Hack TJ, he is an avid member of clubs such as TSA, TJ Speech, and German Honor Society.Outside of school he runs a summer stem program for elementary and middle school kids. In his free time, he likes to read, play basketball, and listen to the newest rap album.',
+		portraitSrc: `${base}/teamportraits/Samvrit.JPG`,
+		order: 1
 	},
 	{
-		name: 'Lindsay Hwang',
-		class: '2024',
+		name: 'Saanvi Indukuri',
+		class: '2025',
 		years: 3,
 		director: true,
 		description:
-			'Lindsay is the Director of HackTJ. She’s a senior at TJHSST and this is her third (and a half) year being on the HackTJ team after competing in HackTJ 7.5 and 8.0. Lindsay is passionate about computer science, especially ML and CV, and math. At TJ, she’s involved in TSA, FTC, Academic Decathlon, and Spanish Honor Society. Outside of school, Lindsay enjoys figure skating, playing lacrosse, and listening to Taylor Swift’s entire discography.',
-		portraitSrc: `${base}/teamportraits/Lindsay.JPG`
+			'Saanvi is a junior at TJHSST, and she’s excited for her second year on the team. She loves seeing how computer science brings to life so many ideas and ties together to other fields she loves such as biology and astronomy. Other than HackTJ, Saanvi is also involved in Astronomy Club, FPS, Red Cross YTF, and she plays field hockey and lacrosse for TJ.  Outside of school, she loves to read, watch lots and lots of TV, and cook.',
+		portraitSrc: `${base}/teamportraits/Saanvi.JPG`,
+		order: 2
 	},
 	{
-		name: 'Krishnan Shankar',
-		class: '2024',
+		name: 'Avni Garg',
+		class: '2025',
 		years: 3,
 		director: false,
 		description:
-			'Krishnan is a senior at TJHSST, and this is his third year on the HackTJ team. He got inspired to join the team after attending HackTJ multiple times, and really wants to contribute to help make it an amazing experience for everyone! Krishnan is fascinating with programming, specifically with full-stack websites and games using languages like Python and JavaScript. Outside of HackTJ, he is a lead sysadmin at TJ and the club president for TJUAV. In his free time, he likes to bike, swim, and play chess with his friends.',
-		portraitSrc: `${base}/teamportraits/Krishnan.JPG`
+			'Avni is a junior at TJHSST, and this is her second year on the team after competing freshman year in HackTJ 9.0! She hopes to make HackTJ a memorable experience for everyone. Avni enjoys math and computer science, especially in the fields of AI and ML. Aside from HackTJ, she is also part of the Varsity Math Team and Computer Team. In her free time, she likes to bike, read, and play card games.',
+		portraitSrc: `${base}/teamportraits/Avni.JPG`,
+		order: 3
 	},
 	{
-		name: 'Vidhi Sharma',
-		class: '2024',
-		years: 3,
+		name: 'Pratyasa Sinha',
+		class: '2025',
+		years: 2,
 		director: false,
 		description:
-			'Vidhi is a senior at TJHSST, and she is so excited for her third year on the HackTJ team after competing her freshman year! Vidhi is passionate about the intersection between computer science and biology, and hopes to go into the medical field in the future. She is a part of HOSA, TSA, and Challenge Success. Outside of school, she loves to sing, listen to music, and spend time with her family and friends.',
-		portraitSrc: `${base}/teamportraits/Vidhi.JPG`
+			'Pratyasa is a junior at TJHSST, and this is her first year on the team after competing in sophomore year! She loves how computer science can be used to innovate and solve problems in different fields, such as medicine and biology. Outside of HackTJ, Pratyasa is involved in FPS and Red Cross YTF. In her free time, she loves to read, bake (especially cookies), and listen to music.',
+		portraitSrc: `${base}/teamportraits/Pratyasa.JPG`,
+		order: 4
 	},
 	{
-		name: 'Pooja Somayajula',
-		class: '2024',
-		years: 2,
+		name: 'Leah Zhang',
+		class: '2025',
+		years: 1,
 		director: false,
 		description: '',
-		portraitSrc: `${base}/teamportraits/Pooja.JPG`,
-		hidden: true
+		portraitSrc: `${base}/teamportraits/Samvrit.JPG`,
+		order: 5
 	},
 	{
-		name: 'Sanika Kale',
-		class: '2024',
-		years: 2,
+		name: 'Megan Sawant',
+		class: '2025',
+		years: 1,
 		director: false,
-		description:
-			'Sanika is a Senior at TJHSST, and is excited for her second year on the HackTJ team! She is passionate about connecting her interests, like neuroscience, with computer science to create projects for social good. Sanika shares her love of STEM by volunteering at local shelters and tutoring underprivileged kids. Outside of HackTJ, she spends her free time playing (and coaching!) volleyball, dancing to Bollywood songs, and watching Netflix shows.',
-		portraitSrc: `${base}/teamportraits/Sanika.JPG`
+		description: '',
+		portraitSrc: `${base}/teamportraits/Samvrit.JPG`,
+		order: 6
 	},
 	{
-		name: 'Avni Garg',
+		name: 'Chinmayee Yerraguntla',
 		class: '2025',
-		years: 2,
+		years: 1,
 		director: false,
-		description:
-			'Avni is a junior at TJHSST, and this is her second year on the team after competing freshman year in HackTJ 9.0! She hopes to make HackTJ a memorable experience for everyone. Avni enjoys math and computer science, especially in the fields of AI and ML. Aside from HackTJ, she is also part of the Varsity Math Team and Computer Team. In her free time, she likes to bike, read, and play card games.',
-		portraitSrc: `${base}/teamportraits/Avni.JPG`
+		description: '',
+		portraitSrc: `${base}/teamportraits/Samvrit.JPG`,
+		order: 7
 	},
 	{
-		name: 'Saanvi Indukuri',
-		class: '2025',
+		name: 'Aanya Gupta',
+		class: '2026',
 		years: 2,
 		director: false,
 		description:
-			'Saanvi is a junior at TJHSST, and she’s excited for her second year on the team. She loves seeing how computer science brings to life so many ideas and ties together to other fields she loves such as biology and astronomy. Other than HackTJ, Saanvi is also involved in Astronomy Club, FPS, Red Cross YTF, and she plays field hockey and lacrosse for TJ.  Outside of school, she loves to read, watch lots and lots of TV, and cook.',
-		portraitSrc: `${base}/teamportraits/Saanvi.JPG`
+			'Aanya is a sophomore at TJHSST, and this is her first year on the team after competing in HackTJ 10.0! She enjoys finding ways to bridge gaps between computer science and biology, solving problems that impact social good. Outside of HackTJ, she is an active participant in the Bioinformatics club, Teknos, and Coding Lady Colonials! In her free time, she enjoys baking for her friends, listening to music, and rock climbing.',
+		portraitSrc: `${base}/teamportraits/Aanya.JPG`,
+		order: 8
 	},
 	{
-		name: 'Samvrit Rao',
-		class: '2025',
-		years: 2,
+		name: 'Medhansh Verma',
+		class: '2026',
+		years: 1,
 		director: false,
-		description:
-			'Samvrit is a junior at TJHSST and this is his second year on the HackTJ team and he joined after competing in freshman year. He is passionate about the intersection of computer science and biology and likes to pursue translational projects related to infectious and neurological diseases. Along with Hack TJ, he is an avid member of clubs such as TSA, TJ Speech, and German Honor Society.Outside of school he runs a summer stem program for elementary and middle school kids. In his free time, he likes to read, play basketball, and listen to the newest rap album.',
-		portraitSrc: `${base}/teamportraits/Samvrit.JPG`
+		description: '',
+		portraitSrc: `${base}/teamportraits/Samvrit.JPG`,
+		order: 9
 	},
 	{
-		name: 'Pratyasa Sinha',
-		class: '2025',
+		name: 'Hashmita Nittala',
+		class: '2026',
 		years: 1,
 		director: false,
-		description:
-			'Pratyasa is a junior at TJHSST, and this is her first year on the team after competing in sophomore year! She loves how computer science can be used to innovate and solve problems in different fields, such as medicine and biology. Outside of HackTJ, Pratyasa is involved in FPS and Red Cross YTF. In her free time, she loves to read, bake (especially cookies), and listen to music.',
-		portraitSrc: `${base}/teamportraits/Pratyasa.JPG`
+		description: '',
+		portraitSrc: `${base}/teamportraits/Samvrit.JPG`,
+		order: 10
 	},
 	{
-		name: 'Kunal Bham',
-		class: '2024',
+		name: 'Shaurya Bisht',
+		class: '2027',
 		years: 1,
 		director: false,
 		description: '',
-		portraitSrc: `${base}/teamportraits/Kunal.JPG`,
-		hidden: true
+		portraitSrc: `${base}/teamportraits/Samvrit.JPG`,
+		order: 11
 	},
 	{
-		name: 'Aanya Gupta',
-		class: '2026',
+		name: 'Sanya Bhalla',
+		class: '2027',
 		years: 1,
 		director: false,
-		description:
-			'Aanya is a sophomore at TJHSST, and this is her first year on the team after competing in HackTJ 10.0! She enjoys finding ways to bridge gaps between computer science and biology, solving problems that impact social good. Outside of HackTJ, she is an active participant in the Bioinformatics club, Teknos, and Coding Lady Colonials! In her free time, she enjoys baking for her friends, listening to music, and rock climbing.',
-		portraitSrc: `${base}/teamportraits/Aanya.JPG`
+		description: '',
+		portraitSrc: `${base}/teamportraits/Samvrit.JPG`,
+		order: 12
+	},
+	{
+		name: 'Sidh Jaddu',
+		class: '2027',
+		years: 1,
+		director: false,
+		description: '',
+		portraitSrc: `${base}/teamportraits/Samvrit.JPG`,
+		order: 13
+	},
+	{
+		name: 'Dhanvinkumar Ganeshkumar',
+		class: '2027',
+		years: 1,
+		director: false,
+		description: '',
+		portraitSrc: `${base}/teamportraits/Samvrit.JPG`,
+		order: 14
 	},
 	{
 		name: 'Mr. Hannum',
 		class: 'sponsor',
 		years: 0,
 		director: false,
 		description: '',
-		portraitSrc: `${base}/teamportraits/MrHannum.JPG`
+		portraitSrc: `${base}/teamportraits/MrHannum.JPG`,
+		order: 15
 	},
 	{
 		name: 'Mr. Kosek',
 		class: 'sponsor',
 		years: 0,
 		director: false,
 		description: '',
-		portraitSrc: `${base}/teamportraits/MrKosek.JPG`
+		portraitSrc: `${base}/teamportraits/MrKosek.JPG`,
+		order: 16
 	}
 ];
 
 teamMembers = teamMembers.filter((member) => !member.hidden);
-teamMembers.sort((a, b) => {
-	const ad = a.director ? 1 : 0;
-	const bd = b.director ? 1 : 0;
-	const ay = a.years;
-	const by = b.years;
-	const ac = a.class;
-	const bc = b.class;
-	const an = a.name;
-	const bn = b.name;
-	// Sort by director?, then by years on the team, then by class, then by first name
-	return bd - ad || by - ay || ac.localeCompare(bc) || an.localeCompare(bn);
-});
+teamMembers.sort((a, b) => a.order - b.order);
 
-export default teamMembers;
+export default teamMembers;