Merge pull request #23 from codenetwork/end-2023-changes

End 2023 changes

src/About.jsx

@@ -4,42 +4,49 @@ import { Routes, Route } from "react-router-dom"
 import AnimatedCursor from "./component/cursor"
 import teamData from "./component/TeamData.json"
 import './team.css';
+import { Email, GitHub, LinkedIn } from "@mui/icons-material"
+import { useEffect } from 'react'
 
-function About()
-{
+function About() {
+  useEffect(() => document.title = "About | Code Network", []);
   return (
     <div className="content-wrapper">
       <div className="edges" style={{ color: "#111", fontFamily: 'Montserrat' }}>
-          <div className = "global-padding">
-            <h2>Build anything, as long as it&apos;s awesome</h2>
-            <p>
-              Code Network is a student-led organisation dedicated to fostering a strong developer community for anyone interested in code.
-            </p>
-            <p>
-              We seek gradual and consistent development of our members' skills and knowledge through weekly meetups and workshops, providing a stage for them to shine via project engagement, industry-sponsored events and hackathons. We also offer networking opportunities and social spaces for like-minded and aspiring students to communicate, collaborate and most importantly, build and share something awesome.
-            </p>
-            <p>
-              We are also active in the Brisbane startup scene, and collaborate frequently with other tech communities on various events, including talks and hackathons. We are confident that we can build an welcoming network that empowers our members to develop fantastic experiences with coding and the tech community.
-            </p>
-            <p>
-              Our 6.5k and growing Facebook membership base is active in both the local and international startup communities.
-            </p>
-            <p>This site is a work in progress. If you'd like to contribute, you can do
-              so <a href="https://github.com/codenetwork/viteCN">here</a>
-            </p>
-            <div className='padding'></div>
-            <h1>Our Team</h1>
-              <div className="team-section">
-                {teamData.map((member, index) => (
-                  <div className="team-member" key={index}>
-                    <img src={member.photo} alt={member.name} />
-                    <h2>{member.name}</h2>
-                    <p className="role">{member.role}</p>
-                    <p className = "description">{member.description}</p>
-                  </div>
-                ))}
+        <div className="global-padding">
+          <h2>Build anything, as long as it&apos;s awesome</h2>
+          <p>
+            Code Network is a student-led organisation dedicated to fostering a strong developer community for anyone interested in code.
+          </p>
+          <p>
+            We seek gradual and consistent development of our members' skills and knowledge through weekly meetups and workshops, providing a stage for them to shine via project engagement, industry-sponsored events and hackathons. We also offer networking opportunities and social spaces for like-minded and aspiring students to communicate, collaborate and most importantly, build and share something awesome.
+          </p>
+          <p>
+            We are also active in the Brisbane startup scene, and collaborate frequently with other tech communities on various events, including talks and hackathons. We are confident that we can build an welcoming network that empowers our members to develop fantastic experiences with coding and the tech community.
+          </p>
+          <p>
+            Our 6.5k and growing Facebook membership base is active in both the local and international startup communities.
+          </p>
+          <p>This site is a work in progress. If you'd like to contribute, you can do
+            so <a href="https://github.com/codenetwork/viteCN">here</a>
+          </p>
+          <div className='padding'></div>
+          <h1>Our Team</h1>
+          <div className="team-section">
+            {teamData.map((member, index) => (
+              <div className="team-member" key={index}>
+                <img src={member.photo} alt={member.name} />
+                <h2>{member.name}</h2>
+                <p className="role">{member.role}</p>
+                <p className="description">{member.description}</p>
+                <p className="personalLinks">
+                  {member.link?.email && <a className="link" href={"mailto:" + member.link.email}><Email /></a>}
+                  {member.link?.linkedin && <a className="link" href={member.link.linkedin}><LinkedIn /></a>}
+                  {member.link?.github && <a className="link" href={member.link.github}><GitHub /></a>}
+                </p>
               </div>
+            ))}
           </div>
+        </div>
       </div >
     </div>
   )

src/Agm.jsx

@@ -1,25 +1,12 @@
 import './App.css'
-import Rules from './Rules'
-import { Routes, Route } from "react-router-dom"
-import AnimatedCursor from "./component/cursor"
-import teamData from "./component/TeamData.json"
 import './agm.css';
 
 function Agm() {
   return (
     <div className="content-wrapper">
       <div className="edges" style={{ color: "#111", fontFamily: 'Montserrat' }}>
         <div className="global-padding">
-          <h1>Code Network's 2023 AGM</h1>
-          <p>We will be electing our 2024 Executive Team and voting on other business, including constitution amendments.</p>
-          <p><b>When and Where:</b> 5-8pm Thursday 5/10/2023 at QUT GP-D106</p>
-          <h2>Key Links</h2>
-          <div style={{ display: 'flex', flexDirection: 'row', gap: '4px', flexWrap: 'wrap' }} id="agmLinks">
-            <a href="https://codenetwork.co/agmagenda" target="_blank">Agenda</a>
-            <a href="https://codenetwork.co/agmpositions" target="_blank">Executive Positions</a>
-            <a href="https://codenetwork.co/agmeoi" target="_blank">Executive EOI</a>
-            <a href="https://codenetwork.co/agmconstitution" target="_blank">Constitution Amendments</a>
-          </div>
+          <h1>The 2023 Code Network AGM has now passed. Details about the 2024 AGM will be announced in September 2024.</h1>
         </div>
       </div >
     </div>

src/Footer.jsx

@@ -9,7 +9,7 @@ function Footer() {
         <section className="global-padding">
           <div className="contentwrapper">
             <div id="congratulations">
-              team@codenetwork.co
+              hello@codenetwork.co
               <div id="copyright">
                 &copy; {new Date().getFullYear().toString()} Code Network
               </div>

src/Rules.jsx

@@ -3,9 +3,11 @@ import AccordionSummary from '@mui/material/AccordionSummary';
 import AccordionDetails from '@mui/material/AccordionDetails';
 import Typography from '@mui/material/Typography';
 import ExpandMoreIcon from '@mui/icons-material/ExpandMore';
+import { useEffect } from 'react'
+
+function Rules() {
+    useEffect(() => document.title = "Rules | Code Network", []);
 
-function Rules()
-{
 
     return (
 

src/Sponsor.jsx

@@ -6,7 +6,12 @@ function Sponsor()
 {
   return (
     <div id="global-padding">
-      <h1>Our Sponsors:</h1>
+      <h1 style={{marginTop: "0", marginBottom: "12px"}}>Would you like to support us in 2024?</h1>
+      <div style={{color: "white", fontSize: "18px", marginBottom: "8px"}}>Send us an email at <a href="mailto:[email protected]">[email protected]</a>.</div>
+      <a href="/code_network_2024_prospectus.pdf" id="action" style={{padding: "8px"}} target="_blank">
+          Read Our Prospectus
+      </a>
+      <h1>Thank you to our 2023 Sponsors!</h1>
       <h2>Platinum Sponsors</h2>
       <div className='sponsor-grid'>
         <a href="https://technologyonecorp.com/" id="action">

src/component/Navbar.jsx

@@ -27,7 +27,6 @@ function Navbar()
             </div>
           </div>
           <a href="/rules">Rules</a>
-          <a href="/agm" style={{margin: 0}}>AGM 2023</a>
 
           <button className="nav-btn nav-close-btn" onClick={showNavbar}>
             <FaTimes />

src/component/TeamData.json

@@ -1,45 +1,95 @@
 [
-    {
-      "name": "Drayko Medlyn",
-      "photo": "/execs/drayko.png",
-      "role": "President",
-      "description": "",
-      "link": "https://www.example.com/john"
-    },
-    {
-      "name": "Jim Chi",
-      "photo": "/execs/jim.jpg",
-      "role": "Vice President",
-      "description": "",
-      "link": "https://www.example.com/john"
-    },
-    {
-      "name": "Nathan Wang",
-      "photo": "/execs/nathan.jpg",
-      "role": "Infrastucture Team",
-      "description": "",
-      "link": "https://www.example.com/john"
-    },
-    {
-      "name": "Corey McCormick",
-      "photo": "/execs/corey.jfif",
-      "role": "Executive",
-      "description": "",
-      "link": "https://www.example.com/john"
-    },
-    {
-      "name": "Dakota Walton",
-      "photo": "/execs/dakota.jfif",
-      "role": "Executive",
-      "description": "",
-      "link": "https://www.example.com/john"
-    },
-    {
-      "name": "Gideon Caturla",
-      "photo": "/execs/gideon.jfif",
-      "role": "Treasurer",
-      "description": "",
-      "link": "https://www.example.com/john"
+  {
+    "name": "Corey McCormick",
+    "photo": "/execs/corey.jfif",
+    "role": "President",
+    "description": "",
+    "link": {
+      "email": "[email protected]",
+      "github": "https://github.com/McCorsa/",
+      "linkedin": "https://www.linkedin.com/in/corey-mccormick/"
     }
-  ]
-
+  },
+  {
+    "name": "Steve Hun",
+    "photo": "/execs/steve2.jpg",
+    "role": "Vice President",
+    "description": "",
+    "link": {
+      "email": "[email protected]"
+    }
+  },
+  {
+    "name": "Farzad Hayat",
+    "photo": "/execs/farzad.jpg",
+    "role": "Treasurer",
+    "link": {
+      "email": "[email protected]",
+      "github": "https://github.com/FarzadHayat",
+      "linkedin": "https://www.linkedin.com/in/farzad-hayat"
+    }
+  },
+  {
+    "name": "Brandon Gan",
+    "photo": "/execs/brandon.jpg",
+    "role": "Events Officer"
+  },
+  {
+    "name": "Zoe Wright",
+    "photo": "/execs/zoe.jpg",
+    "role": "Socials Officer"
+  },
+  {
+    "name": "Christopher Borzi",
+    "photo": "/execs/chris.jpg",
+    "role": "Versatile Executive"
+  },
+  {
+    "name": "Liam D'Souza",
+    "photo": "/execs/liam.jpeg",
+    "role": "Versatile Executive",
+    "link": {
+      "github": "https://github.com/liiam-dsouza",
+      "linkedin": "https://www.linkedin.com/in/liam-d%E2%80%99souza-559a3a235/"
+    }
+  },
+  {
+    "name": "Wenze Wang",
+    "photo": "/execs/wenze.jpg",
+    "role": "Versatile Executive"
+  },
+  {
+    "name": "Patrick Richardson",
+    "photo": "/execs/patrick.jpg",
+    "role": "Developer"
+  },
+  {
+    "name": "Jesse O'Sullivan",
+    "photo": "/execs/jesse.jpg",
+    "role": "Developer"
+  },
+  {
+    "name": "Subiksha Thiya",
+    "photo": "/execs/subiksha.jpg",
+    "role": "Developer"
+  },
+  {
+    "name": "Ryan Melone",
+    "photo": "/execs/ryan.jpg",
+    "role": "Developer (Returning)",
+    "link": {
+      "linkedin": "https://www.linkedin.com/in/ryan-malone-077a5a20b/",
+      "github": "https://github.com/bb3b191"
+    }
+  },
+  {
+    "name": "Drayko Medlyn",
+    "photo": "/execs/drayko.png",
+    "role": "Developer (Returning)"
+  },
+  {
+    "name": "Dakota Walton",
+    "photo": "/execs/dakota.jfif",
+    "role": "Developer (Returning)"
+  }
+]

src/team.css

@@ -30,7 +30,12 @@
 .description {
   padding-left: 50px;
   padding-right: 50px;
-  padding-bottom: 10px;
+  /* padding-bottom: 10px; */
+}
+
+p.personalLinks>a {
+  margin-left: 4px;
+  margin-right: 4px;
 }
 
 /* Media Query for Mobile */