Merge pull request #20 from SIGGraph-UIUC/master

Updating About Page

Author: mx101

.gitignore

@@ -22,3 +22,6 @@ yarn-error.log*
 
 # maya source files
 /public/models/source
+
+# Editor Files
+/.vs

package.json

@@ -4,12 +4,14 @@
   "private": true,
   "homepage": "https://acm-uiuc.github.io/siggraph",
   "dependencies": {
+    "@icons-pack/react-simple-icons": "^4.2.0",
     "bootstrap": "^4.3.1",
+    "gensync": "^1.0.0-beta.2",
     "gh-pages": "^2.0.1",
     "react": "^16.8.6",
     "react-bootstrap": "^1.0.0-beta.9",
     "react-dom": "^16.8.6",
-    "react-feather": "^2.0.3",
+    "react-feather": "^2.0.9",
     "react-router-dom": "^5.0.1",
     "react-scripts": "^3.0.1",
     "react-stack-grid": "^0.7.1",

public/assets/Michael Korenchan.jpg

@@ -1,5 +1,6 @@
 import React from "react";
-import { Mail, Facebook, Slack, Instagram } from "react-feather";
+import { Mail } from "react-feather";
+import { Facebook, Slack, Instagram, Discord } from "@icons-pack/react-simple-icons";
 
 const links = [
   {
@@ -11,7 +12,11 @@ const links = [
   {
     icon: <Instagram />,
     address: "https://www.instagram.com/siggraph.uiuc/"
-  }
+  },
+  {
+    icon: <Discord />,
+    address: "https://discord.gg/tshGb99gF7"
+  },
 ];
 
 const Footer = () => (

public/assets/Sahil Patel.jpg

@@ -1,5 +1,5 @@
 import React, { Component } from "react";
-import { BrowserRouter as Router, Route, Switch } from "react-router-dom";
+import { HashRouter as Router, Route, Switch } from "react-router-dom";
 import { Container } from "react-bootstrap";
 
 import Header from "./Header";
@@ -32,7 +32,7 @@ class Navigation extends Component {
 
   render() {
     return (
-      <Router basename={process.env.PUBLIC_URL}>
+      <Router basename="/"> {/* When using HashRouter, we don't need the public URL as a basename */}
         <Switch>
           <DefaultLayout exact path="/" component={App} size={this.state} />
           <DefaultLayout

public/assets/Stacy Zheng.jpg

@@ -46,31 +46,24 @@ export const about = {
     "We are the student chapter of ACM SIGGRAPH at the University of Illinois at Urbana-Champaign. ACM SIGGRAPH is a nonprofit international membership organization made up of thousands of people who share a passion for computer graphics and interactive techniques. ACM SIGGRAPH members are involved in a wide variety of fields, including computer graphics research, software development, digital art, scientific visualization, interactive technology, game design, visual effects, computer science, education, engineering, graphic design, film and television production, scientific research and more.",
   exec: [
     {
-      name: "Chen Qian",
-      position: "Chair",
-      email: "chenq2@illinois.edu",
-      media: "/assets/69644465_2583059828425174_7273571233680064512_n.jpg"
+      name: "Sahil Patel",
+      position: "Co-Chair",
+      email: "sahilsp2@illinois.edu",
+      media: "/assets/Sahil Patel.jpg"
     },
     {
-      name: "Michelle Giang",
-      position: "Soical Lead",
-      email: "giang2@illinois.edu",
-      media: "/assets/69670963_1519190078220579_5585171975615021056_n.jpg"
+      name: "Stacy Zheng",
+      position: "Co-Chair",
+      email: "stacymz2@illinois.edu",
+      media: "/assets/Stacy Zheng.jpg"
     },
     {
-      name: "Samuel McFadden",
-      position: "Tech Lead",
-      email: "samuelm2@illinois.edu",
-      media: "/assets/69909412_663003744185662_388294541393788928_n.jpg"
+      name: "Michael Korenchan",
+      position: "Co-Chair",
+      email: "mbk6@illinois.edu",
+      media: "/assets/Michael Korenchan.jpg"
     },
-
-    {
-      name: "Kevin Zhang",
-      position: "Project Lead",
-      email: "kevinyz2@illinois.edu",
-      media: "/assets/69737335_758924751191212_7001146307112861696_n.jpg"
-    }
   ],
   meeting:
-      "Join us for meetings on discord Mondays 5-6PM CST!"
-};
+      "Join us for meetings on Discord Mondays 5-6PM CST!"
+};

src/Footer.js

@@ -969,6 +969,13 @@
   dependencies:
     "@hapi/hoek" "8.x.x"
 
+"@icons-pack/react-simple-icons@^4.2.0":
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/@icons-pack/react-simple-icons/-/react-simple-icons-4.2.0.tgz#9218a0f5509bc064da0a6574717e470ec32407a3"
+  integrity sha512-ZWswvsfhwu+fevgO4Cv3j/21J/X7LQJ1sV6gRNyiCx3JpcDlq56NkrWUBVZe/szmES8kOGhYe1L4OmslJgBpSQ==
+  dependencies:
+    prop-types "^15.7.2"
+
 "@jest/console@^24.7.1":
   version "24.7.1"
   resolved "https://registry.yarnpkg.com/@jest/console/-/console-24.7.1.tgz#32a9e42535a97aedfe037e725bd67e954b459545"
@@ -4438,6 +4445,11 @@ gaze@^1.0.0:
   dependencies:
     globule "^1.0.0"
 
+gensync@^1.0.0-beta.2:
+  version "1.0.0-beta.2"
+  resolved "https://registry.yarnpkg.com/gensync/-/gensync-1.0.0-beta.2.tgz#32a6ee76c3d7f52d46b2b1ae5d93fea8580a25e0"
+  integrity sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==
+
 get-caller-file@^1.0.1:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-1.0.3.tgz#f978fa4c90d1dfe7ff2d6beda2a515e713bdcf4a"
@@ -8525,10 +8537,10 @@ react-error-overlay@^5.1.6:
   resolved "https://registry.yarnpkg.com/react-error-overlay/-/react-error-overlay-5.1.6.tgz#0cd73407c5d141f9638ae1e0c63e7b2bf7e9929d"
   integrity sha512-X1Y+0jR47ImDVr54Ab6V9eGk0Hnu7fVWGeHQSOXHf/C2pF9c6uy3gef8QUeuUiWlNb0i08InPSE5a/KJzNzw1Q==
 
-react-feather@^2.0.3:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/react-feather/-/react-feather-2.0.3.tgz#1453ff5d8c242f72b8c02846118fbd2d406375ad"
-  integrity sha512-XVjtxIyMxb2RFlqC2APoB/IZvXKDW9uLN1c264XEeZNYe8jIxjQVQpeTo3nxtHiLTgMfgf0ZYxJC6HwmY8+9BA==
+react-feather@^2.0.9:
+  version "2.0.9"
+  resolved "https://registry.yarnpkg.com/react-feather/-/react-feather-2.0.9.tgz#6e42072130d2fa9a09d4476b0e61b0ed17814480"
+  integrity sha512-yMfCGRkZdXwIs23Zw/zIWCJO3m3tlaUvtHiXlW+3FH7cIT6fiK1iJ7RJWugXq7Fso8ZaQyUm92/GOOHXvkiVUw==
   dependencies:
     prop-types "^15.7.2"