Merge branch 'r2d' into rejon/BugBundleA

makerdao · Sep 4, 2020 · 73f8007 · 73f8007
2 parents 1c0fc89 + d807b0c
commit 73f8007
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 31 deletions.
diff --git a/content/en/work_with_us/hackathons/guide-to-hacking.mdx b/content/en/work_with_us/hackathons/guide-to-hacking.mdx
@@ -58,6 +58,8 @@ We recommend joining our <Link to="https://chat.makerdao.com/channel/community-d
 
 ## Start Hacking
 
+The two sections below contain links to what you should be trying to _Hack_.
+
 <Column>
 
 <Box>
@@ -107,54 +109,46 @@ Components & React-Based Recipes for Various Themes
 
 </Column>
 
-<!-- This was missing a link and such is disabled for the time being -->
-
-<!-- ### Examples
-
-<List>
-
-<Link to="#">
+## Best Practices
 
-Previous Hacks
+<Box sx={{ paddingX: 2 }}>
 
-The best Maker & DAI Hacks from previous hackathons.
+---
 
-</Link>
+- Take advantage of the opportunity to find mentors. A more experienced guide can help you find up-to-date resources and suggest the latest, most efficient ways of building.
 
-</List> -->
+- Set up a team ahead of time. Find a diverse group of people with various skills to round out your idea.
 
-## Best Practices
+- Hackathons are a meeting place for many kinds of developers. Don't be afraid to take the opportunity to make new friends who may be able to teach you something new. Everyone is nervous, and most of us are introverts. It's okay!
 
-<List>
+- Download the latest software you need ahead of time. Don't rely on the WiFi. 
 
-Take advantage of the opportunity to find mentors. A more experienced guide can help you find up-to-date resources and suggest the latest, most efficient ways of building.
+- Self-care is important. Get proper rest, and make sure to take breaks when you need to.
 
-Set up a team ahead of time. Find a diverse group of people with various skills to round out your idea.
+- Balance work and play. Meet exciting people to meet and work on attractive, winning ideas. Everyone comes to have a good time!
 
-Hackathons are a meeting place for many kinds of developers. Don't be afraid to take the opportunity to make new friends who may be able to teach you something new. Everyone is nervous, and most of us are introverts. It's okay!
+- Think of your project as having both core-features and nice-to-have features. Define the core features up-front, and add the nice-to-haves only after building out the main features.
 
-Download the latest software you need ahead of time. Don't rely on the WiFi. 
+- Check and submit your hackathon's submission system at least an hour before the deadline. Most hackathons use a system like DevPost to keep the submission process running smoothly, but uploading can crash the last minute.
 
-Self-care is important. Get proper rest, and make sure to take breaks when you need to.
+- Polish up for presentations. Use this hackathon and its platform to build a portfolio for yourself.
 
-Balance work and play. Meet exciting people to meet and work on attractive, winning ideas. Everyone comes to have a good time!
-
-Think of your project as having both core-features and nice-to-have features. Define the core features up-front, and add the nice-to-haves only after building out the main features.
-
-Check and submit your hackathon's submission system at least an hour before the deadline. Most hackathons use a system like DevPost to keep the submission process running smoothly, but uploading can crash the last minute.
+</Box>
 
-Polish up for presentations. Use this hackathon and its platform to build a portfolio for yourself.
+## Post-Hackathon Best Practices
 
-</List>
+<Box sx={{ paddingX: 2 }}>
 
-## Post-Hackathon Best Practices
+---
 
 - Update your repository or project page to reflect the current status of your project.
 
 - Tweet about your project. There may be other developers interested in helping you continue to build out your hack.
 
 - Stay in touch with your teammates.
 
+</Box>
+
 <Box sx={{ paddingX: 2 }}>
 
 ---

diff --git a/content/en/work_with_us/hackathons/index.mdx b/content/en/work_with_us/hackathons/index.mdx
@@ -40,16 +40,12 @@ They're a great way to meet new and talented people, learn new skills, get acces
 
 Our development grants program uses hackathons to find suitable candidates to fast-track. If you're looking for a grant, taking part in a hackathon is a great way to get our attention.
 
-<!-- We use these events to find and fund great developers who can help us continue building better money. -->
-
 <Box sx={{ marginBottom: 3 }}>
 
 <Link to="/funding/development-grants/">Development Grants</Link>
 
 </Box>
 
-<!-- <Column alt image> -->
-
 <Box sx={{ padding: 4 }}>
 
 <Column>
@@ -67,7 +63,9 @@ If you're organizing a hackathon that involves Maker or DAI as an integral part,
 </Box>
 
 For other questions, please email us at [email protected] 
-or reach out in our <Link to="https://chat.makerdao.com/channel/community-development" icon="rocketchat">Community Chat.</Link>
+or reach out in our community chat.
+
+<Button to="https://chat.makerdao.com/channel/community-development" icon="rocketchat">Community Chat</Button>
 
 </Box>