feat: add new team, add freshers fair, add discord, remove agm

Author: EthanWaite

package-lock.json

@@ -11,23 +11,23 @@
   ],
   "private": true,
   "dependencies": {
-    "@fortawesome/fontawesome-free": "^5.10.2",
-    "@fortawesome/fontawesome-svg-core": "^1.2.22",
-    "@fortawesome/free-brands-svg-icons": "^5.10.2",
-    "@fortawesome/free-regular-svg-icons": "^5.10.2",
-    "@fortawesome/free-solid-svg-icons": "^5.10.2",
-    "@fortawesome/react-fontawesome": "^0.1.4",
-    "@typeform/embed": "^0.12.1",
+    "@fortawesome/fontawesome-free": "^5.15.4",
+    "@fortawesome/fontawesome-svg-core": "^1.2.36",
+    "@fortawesome/free-brands-svg-icons": "^5.15.4",
+    "@fortawesome/free-regular-svg-icons": "^5.15.4",
+    "@fortawesome/free-solid-svg-icons": "^5.15.4",
+    "@fortawesome/react-fontawesome": "^0.1.15",
+    "@typeform/embed": "^0.12.2",
     "@types/jest": "24.0.18",
     "@types/node": "12.7.2",
     "@types/react": "16.9.2",
     "@types/react-dom": "16.9.0",
-    "classnames": "^2.2.6",
-    "react": "^16.9.0",
-    "react-dom": "^16.9.0",
-    "react-google-recaptcha": "^2.0.1",
+    "classnames": "^2.3.1",
+    "react": "^16.14.0",
+    "react-dom": "^16.14.0",
+    "react-google-recaptcha": "^2.1.0",
     "react-helmet": "^5.2.1",
-    "react-router-dom": "^5.2.0",
+    "react-router-dom": "^5.3.0",
     "react-scripts": "3.1.1",
     "typescript": "3.5.3",
     "wowjs": "^1.1.3"
@@ -55,11 +55,11 @@
     ]
   },
   "devDependencies": {
-    "@types/classnames": "^2.2.9",
-    "@types/react-google-recaptcha": "^1.1.0",
-    "@types/react-helmet": "^5.0.10",
-    "@types/react-router-dom": "^5.1.5",
-    "node-sass": "^4.12.0",
+    "@types/classnames": "^2.3.1",
+    "@types/react-google-recaptcha": "^1.1.2",
+    "@types/react-helmet": "^5.0.17",
+    "@types/react-router-dom": "^5.1.8",
+    "node-sass": "^4.14.1",
     "react-snap": "^1.23.0"
   }
 }

package.json

@@ -52,7 +52,7 @@ export const Footer: React.FC = () => (
 			<div className="container row">
 				<div className="info">
 					<p>
-						&copy; 2016-2020 <a href="/">Durham University Computing Society</a>.
+						&copy; 2016-2021 <a href="/">Durham University Computing Society</a>.
 					</p>
 
 					<p>

public/images/events/ff19.jpg

@@ -46,7 +46,6 @@ class HeaderComponent extends React.PureComponent<RouteComponentProps, IHeaderSt
 						</div>
 					</div>
 					<div className="flex"></div>
-					<NavLink to="/agm" onClick={this.close}>AGM</NavLink>
 					<NavLink to="/events" onClick={this.close}>Events</NavLink>
 					<NavLink to="/sponsors" onClick={this.close}>Sponsors</NavLink>
 					<NavLink to="/team" onClick={this.close}>The Team</NavLink>

public/images/team/olivia.jpg

@@ -14,11 +14,11 @@
 
 			> a {
 				display: inline-block;
-				width: 32px;
+				width: 72px;
 				font-size: 32px;
 				text-align: center;
 				color: #000;
-				padding: 20px;
+				padding: 20px 0px;
 				transition: .5s ease;
 
 				&:hover {

public/images/team/steve.jpg

@@ -1,6 +1,6 @@
 import React from 'react';
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
-import { faFacebookF, faTwitter, faSlackHash } from '@fortawesome/free-brands-svg-icons';
+import { faFacebookF, faTwitter, faDiscord } from '@fortawesome/free-brands-svg-icons';
 
 import { Button } from '../button/button';
 import { popup } from '../../util/typeform';
@@ -23,8 +23,8 @@ export class JoinBanner extends React.PureComponent {
 							<FontAwesomeIcon icon={faTwitter} />
 						</a>
 
-						<a href="https://ducompsoc.slack.com/" target="_blank" rel="noopener noreferrer">
-							<FontAwesomeIcon icon={faSlackHash} />
+						<a href="/discord" target="_blank" rel="noopener noreferrer">
+							<FontAwesomeIcon icon={faDiscord} />
 						</a>
 					</div>
 				</div>

src/components/footer/footer.tsx

@@ -65,6 +65,19 @@ export const config: ISiteData = {
 		},
 
 		// New events.
+		{
+			name: 'CompSoc at Freshers\' Fair 2021',
+			when: {
+				dates: [new Date('2021-09-29T18:00:00Z')],
+				text: '29th Sept 2021',
+			},
+			thumbnail: 'events/ff19.jpg',
+			link: 'https://www.facebook.com/events/1108743579654456/',
+			location: 'Maiden Castle Sports Centre',
+			description: [
+				'CompSoc will be at Freshers\' Fair! Come say hi if you’re interested in tech, computers, programming, or if you want to learn. Chat to us and find out more about what CompSoc is and what we do!'
+			]
+		},
 		{
 			name: 'CompSoc AGM 2021',
 			description: [
@@ -709,37 +722,67 @@ export const config: ISiteData = {
 				description: 'In charge of overseeing everything in the society and reaching out to sponsors.',
 			},
 			{
-				name: 'Irenitemi Agbejule',
-				image: 'irenitemi.jpg',
+				name: 'Disha Gupta',
+				image: null,
 				role: 'Events Officer',
 				description: 'Works with sponsors and guest speakers to organise talks and workshops.',
 			},
 			{
-				name: 'Heidi Januszewski',
-				image: 'heidi.jpg',
+				name: 'Olivia Hampshire',
+				image: 'olivia.jpg',
 				role: 'Finance Officer',
 				description: 'Manages CompSoc\'s finances.',
 			},
-			/* {
-				name: '...',
-				image: null,
+			{
+				name: 'Heidi Januszewski',
+				image: 'heidi.jpg',
 				role: 'Media & Publicity Officer',
 				description: 'In charge of the website content, social media, the mailing list, and promoting the society around the university.',
-			}, */
+			},
 			{
 				name: 'Ethan Waite',
 				image: 'ethan.jpg',
 				role: 'Technical Web Officer',
 				description: 'Works with the Publicity Officer to manage the technical side of the website.',
 			},
 			{
-				name: 'Meredith Gibbons',
-				image: 'merry.jpg',
+				name: 'Steve Thomas',
+				image: 'steve.jpg',
 				role: 'Secretary',
 				description: 'Responsible for working with sponsors and other organisations to ensure CompSoc runs smoothly, handling contracts and paperwork.',
 			},
 		],
 		past: [
+			{
+				year: '2020/2021',
+				members: [
+					{
+						name: 'Tom Nudd',
+						image: 'tom.jpg',
+						role: 'President',
+					},
+					{
+						name: 'Irenitemi Agbejule',
+						image: 'irenitemi.jpg',
+						role: 'Events Officer',
+					},
+					{
+						name: 'Heidi Januszewski',
+						image: 'heidi.jpg',
+						role: 'Finance Officer',
+					},
+					{
+						name: 'Ethan Waite',
+						image: 'ethan.jpg',
+						role: 'Technical Web Officer',
+					},
+					{
+						name: 'Meredith Gibbons',
+						image: 'merry.jpg',
+						role: 'Secretary',
+					},
+				],
+			},
 			{
 				year: '2019/2020',
 				members: [