From 3e9b7bd5e674c88ff63b7fa63ec4d5d348d242d2 Mon Sep 17 00:00:00 2001 From: Gabriel Diniz Date: Wed, 10 Apr 2024 13:48:33 -0400 Subject: [PATCH 01/10] [Update] remove duplicate question --- src/components/sections/data/faqData.ts | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/components/sections/data/faqData.ts b/src/components/sections/data/faqData.ts index 2a2e7d75..80830e3b 100644 --- a/src/components/sections/data/faqData.ts +++ b/src/components/sections/data/faqData.ts @@ -14,10 +14,6 @@ const faqData = [ question: '💰 How much does it cost?', answer: '$0.00! Due to our amazing sponsors and support systems, attending and participating at HawkHacks is completely free!', }, - { - question: '💻 Who can attend? Do I need to be a crazy W-skilled programmer?', - answer: 'Anybody from someone who doesn’t know what a computer is, to someone who makes computers, can attend the hackathon!\\nYou can either create a piece of software in 36 hours, attend the workshops and seminars, or do a bit of both - all up to you!', - }, { question: '📧 This is a cool FAQ section, but I still have a question!', answer: 'No worries! Reach out to us via email at hello@hawkhacks.ca or on any of our socials, and we’ll get back to you as soon as our social media person wakes up!', From 79e24d74ba325c186dde47a9185b4a86a31e7dc4 Mon Sep 17 00:00:00 2001 From: Gabriel Diniz Date: Wed, 10 Apr 2024 13:49:57 -0400 Subject: [PATCH 02/10] [Update] Fix answer for when do applications open --- src/components/sections/data/faqData.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/sections/data/faqData.ts b/src/components/sections/data/faqData.ts index 80830e3b..c14040da 100644 --- a/src/components/sections/data/faqData.ts +++ b/src/components/sections/data/faqData.ts @@ -29,7 +29,7 @@ const faqData = [ }, { question: '📅 When do applications open?', - answer: 'Hacker, mentor, and volunteer applications open on April 5th, 2024. HawkHacks 2024 applications have now closed! If you’ve applied, make sure to keep an eye on your dashboard or email for updates!', + answer: 'Hacker, mentor, and volunteer applications open on April 7th, 2024 and are closing on May 3rd, 2024 at 11:59 PM!S', }, { question: '🎓 Am I eligible to participate?', From 4e77ae01908aab1bd6028eea6c712c102978deac Mon Sep 17 00:00:00 2001 From: Gabriel Diniz Date: Wed, 10 Apr 2024 14:04:26 -0400 Subject: [PATCH 03/10] [Update] Answer for why should I come to HH --- src/components/sections/data/faqData.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/sections/data/faqData.ts b/src/components/sections/data/faqData.ts index c14040da..c25e0f9b 100644 --- a/src/components/sections/data/faqData.ts +++ b/src/components/sections/data/faqData.ts @@ -7,8 +7,8 @@ const faqData = [ answer: 'A hackathon consists of two “parts” - a social coding event where programmers, designers, and developers collaborate in teams to solve a problem. You can either create a software-based project that falls under a category hack or make whatever your heart desires as a general hack.\\n The second section is networking events, seminars, and presentations that happen throughout the hackathon conducted by industry and academic professionals - if you’ve been putting off learning that one programming language for a while, now might be the time to learn!', }, { - question: '🏆 Why should I come to HawkHacks specifically??', - answer: 'Firstly, we’re giving away over $30,000 of value in prizes! Last year, some of the prizes included iPads and Nintendo Switches!', + question: '🏆 Why should I come to HawkHacks? What types of things can I expect?', + answer: 'Picture this: over $35,000 worth of prizes, including cool stuff like iPads and Nintendo Switches just waiting to be won!\\nBut hey, it\'s not all about the prizes (although they\'re pretty awesome). We\'ve lined up a bunch of events throughout the weekend that are all about boosting your career, soft skills, and tech skills. You\'ll get to hang out with industry professionals from academia, business, entrepreneurship - you name it. They\'re here to share their wisdom and insights, and maybe even teach you a thing or two.\\nAnd let\'s not forget the fun stuff! We\'ve got tons of mini-games and tournaments lined up, each with its own crazy prizes. Think of a spicy ramen challenge, a fast-typing tournament, and even a pizza-eating competition! It\'s all about having a blast while learning and connecting with awesome people.', }, { question: '💰 How much does it cost?', From b7f437cca4d61fe4f7f550925d441c161108a5dc Mon Sep 17 00:00:00 2001 From: Gabriel Diniz Date: Wed, 10 Apr 2024 14:09:22 -0400 Subject: [PATCH 04/10] [Update] add preparation section --- src/components/sections/data/faqData.ts | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/src/components/sections/data/faqData.ts b/src/components/sections/data/faqData.ts index c25e0f9b..fa889a1c 100644 --- a/src/components/sections/data/faqData.ts +++ b/src/components/sections/data/faqData.ts @@ -41,6 +41,23 @@ const faqData = [ }, ], }, + { + section: 'Preparation', + content: [ + { + question: '📜 What should I bring to HawkHacks?', + answer: 'At a minimum, you should have a device to code on (ideally a laptop), a charger (for your phone and laptop), and a piece of student or government ID. We also recommend bringing stuff to stay comfy, such as a blanket, pillow, and an oversized hoodie.\\nKeep in mind that this is an overnight event - you may want to consider hygiene products as well!', + }, + { + question: '🔎 I’m lost! How do I find the HawkHacks building?', + answer: 'HawkHacks is being hosted at the Lazaridis School of Business and Economics, which is located in Waterloo, Ontario, at Wilfrid Laurier University’s main campus. Google Map directions can be found here. ADD EMBEDED LINK: https://www.google.com/maps/dir//Lazaridis+School+of+Business+and+Economics,+64+University+Ave+W,+Waterloo,+ON+N2L+3C7', + }, + { + question: '🚗 I’ll be commuting - do you guys cover transportation costs? How can I get to Waterloo?', + answer: 'Unfortunately, we’re unable to cover transportation costs. There are many ways to commute - GO Bus, GO Train, VIA Rail, and Flixbus!\\nIf those options aren’t feasible, we also have a #rideshare channel on our Discord server where people can coordinate carpools!', + }, + ], + }, { section: 'Health & Safety', content: [ From 517d8c689759406053d9cf270427c15dba5d3212 Mon Sep 17 00:00:00 2001 From: Gabriel Diniz Date: Wed, 10 Apr 2024 18:50:35 -0400 Subject: [PATCH 05/10] [Update] FAQ paragraph spacing --- src/components/Accordion.tsx | 6 +++--- src/components/sections/TeamFAQ.section.tsx | 5 ++++- src/components/sections/data/faqData.ts | 14 +++++++++----- 3 files changed, 16 insertions(+), 9 deletions(-) diff --git a/src/components/Accordion.tsx b/src/components/Accordion.tsx index 5ef1822e..37a51da3 100644 --- a/src/components/Accordion.tsx +++ b/src/components/Accordion.tsx @@ -78,7 +78,7 @@ const Accordion: React.FC = ({ sections }) => { activeIndex && activeIndex.section === sectionIndex && activeIndex.question === questionIndex - ? 'max-h-96' + ? 'max-h-full' : 'max-h-0 border-none' } rounded-xl rounded-t-none border border-black bg-deepMarine`} > @@ -86,10 +86,10 @@ const Accordion: React.FC = ({ sections }) => { .split('\\n') .map((line, idx, arr) => ( -

+

{line}

- {idx < arr.length - 1 &&
} + {idx < arr.length - 1} ))} diff --git a/src/components/sections/TeamFAQ.section.tsx b/src/components/sections/TeamFAQ.section.tsx index 0dabcb50..b9465453 100644 --- a/src/components/sections/TeamFAQ.section.tsx +++ b/src/components/sections/TeamFAQ.section.tsx @@ -70,7 +70,10 @@ const TeamFAQSection = () => { -
+
Date: Wed, 10 Apr 2024 19:20:40 -0400 Subject: [PATCH 06/10] [Update] all FAQ questions and answers --- src/components/sections/data/faqData.ts | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/components/sections/data/faqData.ts b/src/components/sections/data/faqData.ts index ee66e5f7..ac6fc3f0 100644 --- a/src/components/sections/data/faqData.ts +++ b/src/components/sections/data/faqData.ts @@ -4,7 +4,7 @@ const faqData = [ content: [ { question: '🤔 What is a Hackathon?', - answer: 'A hackathon consists of two “parts” - a social coding event where programmers, designers, and developers collaborate in teams to solve a problem. You can either create a software-based project that falls under a category hack or make whatever your heart desires as a general hack.\\n The second section is networking events, seminars, and presentations that happen throughout the hackathon conducted by industry and academic professionals - if you’ve been putting off learning that one programming language for a while, now might be the time to learn!', + answer: 'A hackathon consists of two “parts” - a social coding event where teams of programmers, designers, and developers collaborate to solve a problem. You can either create a software-based project that falls under a category hack or make whatever your heart desires as a general hack.\\nThe second section involves networking events, seminars, and presentations conducted by industry and academic professionals. These mini-events are scheduled throughout the hackathon - they’re completely optional, but are great ways to take a break from your hacking, and to even learn a new skill!', }, { question: @@ -28,11 +28,11 @@ const faqData = [ { question: '🔑 Do I need to know how to code like some sort of crazy hacker?', - answer: 'Anybody from someone who doesn’t know what a computer is, to someone who makes computers can attend the hackathon! You can either create a piece of software in 36 hours, attend the workshops and seminars, or do a bit of both - all up to you!', + answer: 'Anybody can attend HawkHacks! From someone who doesn’t know what a computer is, to someone who makes computers - everyone’s welcome!\\nYou can either create a piece of software in 36 hours, attend the workshops and seminars, or do a bit of both - all up to you!', }, { - question: '📅 When do applications open?', - answer: 'Hacker, mentor, and volunteer applications open on April 7th, 2024 and are closing on May 3rd, 2024 at 11:59 PM!S', + question: '📅 When can I apply', + answer: 'Hacker, mentor, and volunteer applications open on April 7th, 2024 and are closing on May 3rd, 2024 at 11:59 PM!', }, { question: '🎓 Am I eligible to participate?', @@ -40,7 +40,7 @@ const faqData = [ }, { question: '👫 Do I need a team?', - answer: 'You can work alone, or up to a team of 4 people - we strongly encourage working in a team! If you don’t have friends who are attending, you can find a team in our Discord OR in person.', + answer: 'You can work alone, or up to a team of 4 people, but we strongly encourage working with a team! If you’re looking for a team, check out our #looking-for-team Discord channel OR during our in-person team-building event.', }, ], }, @@ -53,7 +53,7 @@ const faqData = [ }, { question: '🔎 I’m lost! How do I find the HawkHacks building?', - answer: 'HawkHacks is being hosted at the Lazaridis School of Business and Economics, which is located in Waterloo, Ontario, at Wilfrid Laurier University’s main campus. Google Map directions can be found here. ADD EMBEDED LINK: https://www.google.com/maps/dir//Lazaridis+School+of+Business+and+Economics,+64+University+Ave+W,+Waterloo,+ON+N2L+3C7', + answer: 'HawkHacks is being hosted at the Lazaridis School of Business and Economics, which is located in Waterloo, Ontario, at Wilfrid Laurier University’s main campus.', }, { question: From 9af00bba17fed954770665e5463f2ef76b1f0b79 Mon Sep 17 00:00:00 2001 From: Gabriel Diniz Date: Wed, 10 Apr 2024 21:55:07 -0400 Subject: [PATCH 07/10] [Update] add google maps link to tag --- src/components/Accordion.tsx | 22 ++++++++++++++++++---- src/components/sections/data/faqData.ts | 2 +- 2 files changed, 19 insertions(+), 5 deletions(-) diff --git a/src/components/Accordion.tsx b/src/components/Accordion.tsx index 37a51da3..ab9dbeb8 100644 --- a/src/components/Accordion.tsx +++ b/src/components/Accordion.tsx @@ -86,10 +86,24 @@ const Accordion: React.FC = ({ sections }) => { .split('\\n') .map((line, idx, arr) => ( -

- {line} -

- {idx < arr.length - 1} + {line.includes(' + +

+ ) : ( +

+ {line} +

+ )} + {idx < arr.length - 1}{' '} ))}
diff --git a/src/components/sections/data/faqData.ts b/src/components/sections/data/faqData.ts index ac6fc3f0..b1142c2e 100644 --- a/src/components/sections/data/faqData.ts +++ b/src/components/sections/data/faqData.ts @@ -53,7 +53,7 @@ const faqData = [ }, { question: '🔎 I’m lost! How do I find the HawkHacks building?', - answer: 'HawkHacks is being hosted at the Lazaridis School of Business and Economics, which is located in Waterloo, Ontario, at Wilfrid Laurier University’s main campus.', + answer: 'HawkHacks is being hosted at the Lazaridis School of Business and Economics, which is located in Waterloo, Ontario, at Wilfrid Laurier University’s main campus. Google Map directions can be found here.', }, { question: From 1becde3a235a47ad19b4f96377ed41ac84f7fdaa Mon Sep 17 00:00:00 2001 From: Gabriel Diniz Date: Thu, 11 Apr 2024 10:05:48 -0400 Subject: [PATCH 08/10] [Update] add Discord and mailto hyperlinks --- src/components/sections/data/faqData.ts | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/components/sections/data/faqData.ts b/src/components/sections/data/faqData.ts index b1142c2e..caec737f 100644 --- a/src/components/sections/data/faqData.ts +++ b/src/components/sections/data/faqData.ts @@ -18,7 +18,7 @@ const faqData = [ { question: '📧 This is a cool FAQ section, but I still have a question!', - answer: 'No worries! Reach out to us via email at hello@hawkhacks.ca or on any of our socials, and we’ll get back to you as soon as our social media person wakes up!', + answer: 'No worries! Reach out to us via email at hello@hawkhacks.ca or on any of our socials, and we’ll get back to you as soon as our social media person wakes up!', }, ], }, @@ -40,10 +40,11 @@ const faqData = [ }, { question: '👫 Do I need a team?', - answer: 'You can work alone, or up to a team of 4 people, but we strongly encourage working with a team! If you’re looking for a team, check out our #looking-for-team Discord channel OR during our in-person team-building event.', + answer: 'You can work alone, or up to a team of 4 people, but we strongly encourage working with a team! If you’re looking for a team, check out our #looking-for-team Discord channel OR during our in-person team-building event.', }, ], }, + { section: 'Preparation', content: [ @@ -58,7 +59,7 @@ const faqData = [ { question: '🚗 I’ll be commuting - do you guys cover transportation costs? How can I get to Waterloo?', - answer: 'Unfortunately, we’re unable to cover transportation costs. There are many ways to commute - GO Bus, GO Train, VIA Rail, and Flixbus!\\nIf those options aren’t feasible, we also have a #rideshare channel on our Discord server where people can coordinate carpools!', + answer: 'Unfortunately, we’re unable to cover transportation costs. There are many ways to commute - GO Bus, GO Train, VIA Rail, and Flixbus!\\nIf those options aren’t feasible, we also have a #rideshare channel on our Discord server where people can coordinate carpools!', }, ], }, From dd609caf85828ec227daaa12ad4bdddedad85cb0 Mon Sep 17 00:00:00 2001 From: Gabriel Diniz Date: Thu, 11 Apr 2024 19:02:21 -0400 Subject: [PATCH 09/10] [Update] add regex to catch all tags --- src/components/Accordion.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/Accordion.tsx b/src/components/Accordion.tsx index ab9dbeb8..cf001686 100644 --- a/src/components/Accordion.tsx +++ b/src/components/Accordion.tsx @@ -91,7 +91,7 @@ const Accordion: React.FC = ({ sections }) => { Date: Sat, 13 Apr 2024 09:58:42 -0400 Subject: [PATCH 10/10] Update formatting --- src/components/sections/data/faqData.ts | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/src/components/sections/data/faqData.ts b/src/components/sections/data/faqData.ts index caec737f..28a1451b 100644 --- a/src/components/sections/data/faqData.ts +++ b/src/components/sections/data/faqData.ts @@ -4,7 +4,7 @@ const faqData = [ content: [ { question: '🤔 What is a Hackathon?', - answer: 'A hackathon consists of two “parts” - a social coding event where teams of programmers, designers, and developers collaborate to solve a problem. You can either create a software-based project that falls under a category hack or make whatever your heart desires as a general hack.\\nThe second section involves networking events, seminars, and presentations conducted by industry and academic professionals. These mini-events are scheduled throughout the hackathon - they’re completely optional, but are great ways to take a break from your hacking, and to even learn a new skill!', + answer: 'A hackathon consists of two “parts” - a social coding event where teams of programmers, designers, and developers collaborate to solve a problem. You can either create a software-based project that falls under a category hack or make whatever your heart desires as a general hack.\\nThe second section involves networking events, seminars, and presentations conducted by industry and academic professionals. These mini-events are scheduled throughout the hackathon - they\'re completely optional, but are great ways to take a break from your hacking, and to even learn a new skill!', }, { question: @@ -18,17 +18,18 @@ const faqData = [ { question: '📧 This is a cool FAQ section, but I still have a question!', - answer: 'No worries! Reach out to us via email at hello@hawkhacks.ca or on any of our socials, and we’ll get back to you as soon as our social media person wakes up!', + answer: 'No worries! Reach out to us via email at hello@hawkhacks.ca or on any of our socials, and we\'ll get back to you as soon as our social media person wakes up!', }, ], }, + { section: 'Eligibility', content: [ { question: '🔑 Do I need to know how to code like some sort of crazy hacker?', - answer: 'Anybody can attend HawkHacks! From someone who doesn’t know what a computer is, to someone who makes computers - everyone’s welcome!\\nYou can either create a piece of software in 36 hours, attend the workshops and seminars, or do a bit of both - all up to you!', + answer: 'Anybody can attend HawkHacks! From someone who doesn\'t know what a computer is, to someone who makes computers - everyone\'s welcome!\\nYou can either create a piece of software in 36 hours, attend the workshops and seminars, or do a bit of both - all up to you!', }, { question: '📅 When can I apply', @@ -36,11 +37,11 @@ const faqData = [ }, { question: '🎓 Am I eligible to participate?', - answer: 'As long as you’re over the age of 13, and are either a high-schooler, a post-secondary student (i.e. university or college), or a recent graduate, you are eligible to participate.', + answer: 'As long as you\'re over the age of 13, and are either a high-schooler, a post-secondary student (i.e. university or college), or a recent graduate, you are eligible to participate.', }, { question: '👫 Do I need a team?', - answer: 'You can work alone, or up to a team of 4 people, but we strongly encourage working with a team! If you’re looking for a team, check out our #looking-for-team Discord channel OR during our in-person team-building event.', + answer: 'You can work alone, or up to a team of 4 people, but we strongly encourage working with a team! \\nIf you\'re looking for a team, check out our #looking-for-team Discord channel OR during our in-person team-building event.', }, ], }, @@ -53,22 +54,23 @@ const faqData = [ answer: 'At a minimum, you should have a device to code on (ideally a laptop), a charger (for your phone and laptop), and a piece of student or government ID. We also recommend bringing stuff to stay comfy, such as a blanket, pillow, and an oversized hoodie.\\nKeep in mind that this is an overnight event - you may want to consider hygiene products as well!', }, { - question: '🔎 I’m lost! How do I find the HawkHacks building?', - answer: 'HawkHacks is being hosted at the Lazaridis School of Business and Economics, which is located in Waterloo, Ontario, at Wilfrid Laurier University’s main campus. Google Map directions can be found here.', + question: '🔎 I\'m lost! How do I find the HawkHacks building?', + answer: 'HawkHacks is being hosted at the Lazaridis School of Business and Economics, which is located in Waterloo, Ontario, at Wilfrid Laurier University\'s main campus. Google Map directions can be found here.', }, { question: - '🚗 I’ll be commuting - do you guys cover transportation costs? How can I get to Waterloo?', - answer: 'Unfortunately, we’re unable to cover transportation costs. There are many ways to commute - GO Bus, GO Train, VIA Rail, and Flixbus!\\nIf those options aren’t feasible, we also have a #rideshare channel on our Discord server where people can coordinate carpools!', + '🚗 I\'ll be commuting - do you guys cover transportation costs? How can I get to Waterloo?', + answer: 'Unfortunately, we\'re unable to cover transportation costs. There are many ways to commute - GO Bus, GO Train, VIA Rail, and Flixbus!\\nIf those options aren\'t feasible, we also have a #rideshare channel on our Discord server where people can coordinate carpools!', }, ], }, + { section: 'Health & Safety', content: [ { question: '😷 What are your COVID-19 regulations?', - answer: 'At this time, HawkHacks does not have a COVID-19 policy in effect and won’t be enforcing any COVID-related rules or restrictions. We recommend you do your due diligence when it comes to your health, and take precautions as necessary. We will have a small amount of hygiene products, such as hand sanitizers, available at the event.\\nWe ask that if you are feeling sick or unwell, to not attend the event for the respect and safety of everyone else at the event.', + answer: 'At this time, HawkHacks does not have a COVID-19 policy in effect and won\'t be enforcing any COVID-related rules or restrictions. We recommend you do your due diligence when it comes to your health, and take precautions as necessary. We will have a small amount of hygiene products, such as hand sanitizers, available at the event.\\nWe ask that if you are feeling sick or unwell, to not attend the event for the respect and safety of everyone else at the event.', }, ], },