Merge pull request #3 from SanjitPingili/main

Main

Author: sbuckley02

data/homeData.js

@@ -1,6 +1,6 @@
 let slogan = "Fostering the learning of web development framework by framework";
 
-let aboutUs = "At GT WebDev, we learn about different web development languages, technologies, and frameworks, as well as how they work in combination with each other. Learning is done with a hybrid of both a traditional, demo-style approach and an interactive, hands-on approach. For the former, we have weekly tutorials on web development technologies like Node.js, MongoDB, and React.js. For the latter, we have project teams in which members can practice their newly-learned skills into nice, (ideally) working web applications.";
+let aboutUs = "At GT WebDev, we take an interactive approach to learning web development. We have project teams in which members use up-to-date technologies to make exciting web applications. We have hackathons and other interactive events where members can practice their skills as well as gain new ones. Finally, we have workshops where members can learn about cool things like new technologies, design patterns, life after college, etc.";
 
 let qAndAs = [
     {

pages/contact.js

@@ -105,9 +105,9 @@ class MainContact extends Component {
                         </Link>
                     </Grid>
                     <Grid item xs={12} md={4}>
-                        <Link href="https://www.facebook.com/GtWebdev/">
-                            <img src="facebookIcon.png" className="mainContactImg"></img>
-                            <Typography variant="body1">facebook.com/GtWebdev/</Typography>
+                        <Link href="https://www.instagram.com/gtwebdev/">
+                            <img src="Instagram.png" className="mainContactImg"></img>
+                            <Typography variant="body1">Instagram.com/gtwebdev/</Typography>
                         </Link>
                     </Grid>
                 </Grid>

pages/join.js

@@ -79,13 +79,20 @@ class Join extends Component {
                 </div>
                 <BottomBar /> */}
                 <div className="main">
-                    <Typography variant="h4" className="title">how to join</Typography>
+                    <Typography variant="h4" className="title1">how to join</Typography>
                     <Typography variant="body1">
                         You can join GT WebDev by joining our Discord at this link:&nbsp;
                         <Link href="https://discord.gg/BbykvvQmGz">
                             https://discord.gg/BbykvvQmGz
                         </Link>
                     </Typography>
+                    <br />
+                    <br />
+                    <Typography variant="h4" className="title2">where do we meet</Typography>
+                    <Typography variant="body1">Our project teams meet every Tuesday from 6:30 P.M. to around 7:30 P.M. Atlanta time in CCB (College of Computing Building) 102. 
+                        <br />
+                        The time and place for our events and workshops vary, but they will typically take place on Thursdays at 6:30 P.M.
+                    </Typography>
                 </div>
             </div>
         );

pages/schedule.js

@@ -22,10 +22,6 @@ class Schedule extends Component {
                 </Head>
                 <NavBar />
                 <div className="main">
-                    <Typography variant="h4" className="title">where we meet</Typography>
-                    <Typography className="indented" variant="body1">{meetData}</Typography>
-                    <br />
-                    <br />
                     <Typography variant="h4" className="schedLabel">schedule</Typography>
                     <SchedTable />
                 </div>