Merge pull request #81 from sim1029/master

Add old google-cal link

src/components/data.js

@@ -40,15 +40,6 @@ export const officerList = [
     image: "../images/officers_2022/abhinav.jpg",
     bio: "Hey guys, this year, I hope to help lead the partnerships the club has with other organizations. As an officer and member of the academic affairs committee in student government, I hope to act and eventually help grow the connection between CSC and the Student government.",
   },
-  {
-    name: "Hina Sekine",
-    title: "Public Relations Manager",
-    linkedIn: "",
-    email: "his38@pitt.edu",
-    image: "../images/officers_2022/hina.jpg",
-    bio: "Hello all! I’m Hina Sekine, a CS major at Pitt! I have a confession to make, despite CS being a central part of my life since I entered university, I despise coding itself. I believe that it’s a crime we’re forced against our will to use computers and code in the year 2022.",
-  },
-
   {
     name: "Minhal Khan",
     title: "Public Relations Manager",

src/pages/about.js

@@ -3,7 +3,7 @@ import { officerList } from "../components/data";
 import { hotjar } from "react-hotjar";
 import ReactGA from "react-ga";
 import { motion } from "framer-motion";
-import SpringReport from "../downloads/Pitt_CSC_Spring_Report.pdf";
+import FallReport from "../downloads/gbm-fall-2022.pdf";
 
 import Layout from "../layouts/layout";
 import TeamCard from "../components/TeamCard";
@@ -119,11 +119,11 @@ const AboutPage = () => {
                   <motion.a
                     whileHover={{ scale: 1.1 }}
                     whileTap={{ scale: 0.9 }}
-                    href={SpringReport}
+                    href={FallReport}
                     target="_blank"
                     className="inline-block my-4 px-4 py-2 min-w-min text-center text-black font-bold bg-white border-4 border-secondary-100 rounded-full focus:outline-none hover:shadow-lg shadow-md transition"
                   >
-                    See Spring Report
+                    Initiatives - Fall 2022
                   </motion.a>
                 </div>
                 <div className="relative flex flex-col items-center justify-center mt-4 w-full lg:mt-0 lg:w-1/2">

src/pages/index.js

@@ -3,6 +3,7 @@ import { graphql } from "gatsby";
 import { Link } from "gatsby";
 import Lottie from "react-lottie";
 import { StaticImage } from "gatsby-plugin-image";
+import { getAcademicYear } from "../utils/dates";
 
 import animationData from "../animations/pittcscLogoAnimation.json";
 
@@ -19,7 +20,7 @@ import { faVideo, faEnvelope } from "@fortawesome/free-solid-svg-icons";
 import { motion, useAnimation } from "framer-motion";
 import { hotjar } from "react-hotjar";
 import ReactGA from "react-ga";
-import SpringReport from "../downloads/Pitt_CSC_Spring_Report.pdf";
+import FallReport from "../downloads/gbm-fall-2022.pdf";
 
 import { useInView } from "react-intersection-observer";
 
@@ -198,7 +199,7 @@ const IndexPage = ({ data }) => {
                 variants={text}
                 className="relative z-10 text-lg font-light xl:text-xl"
               >
-                2021-2022 SCHOOL YEAR
+                {getAcademicYear()} SCHOOL YEAR
               </motion.p>
               <motion.h1
                 variants={text}
@@ -329,12 +330,12 @@ const IndexPage = ({ data }) => {
                   animate={controls}
                   whileHover={{ scale: 1.1 }}
                   whileTap={{ scale: 0.9 }}
-                  href={SpringReport}
+                  href={FallReport}
                   target="_blank"
                   className="absolute z-20 -bottom-4 inline-block"
                 >
                   <button className="min-w-300 px-4 py-2 text-center text-black font-bold bg-white border-4 border-secondary-100 rounded-full focus:outline-none hover:shadow-lg shadow-md transition">
-                    See Spring Report
+                    Initiatives - Fall 2022
                   </button>
                 </motion.a>
               </div>
@@ -522,7 +523,7 @@ const IndexPage = ({ data }) => {
               <iframe
                 src="https://calendar.google.com/calendar/embed?src=f64u131to44gn3tn8g62ov2u1s%40group.calendar.google.com&ctz=America%2FNew_York"
                 title="Pitt CSC Google Calendar"
-                frameBorder="0"
+                frameborder="0"
                 scrolling="no"
                 height="600"
                 className="w-full"

src/pages/sponsors.js

@@ -4,9 +4,9 @@ import Eaton from "../images/sponsors/Eaton-logo.jpeg";
 import PNC from "../images/sponsors/PNC_logo.png";
 import Naval from "../images/sponsors/naval_nuclear_lab.jpeg";
 
-import SpringReportImage from "../images/Spring_Report_Image.png";
+import SpringReportImage from "../images/hero_image.png";
 
-import SpringReport from "../downloads/Pitt_CSC_Spring_Report.pdf";
+import FallReport from "../downloads/gbm-fall-2022.pdf";
 
 import { motion } from "framer-motion";
 import { hotjar } from "react-hotjar";
@@ -171,16 +171,16 @@ const SponsorPage = ({ data }) => {
                   <motion.a
                     whileHover={{ scale: 1.1 }}
                     whileTap={{ scale: 0.9 }}
-                    href={SpringReport}
+                    href={FallReport}
                     target="_blank"
                     className="min-w-300 absolute -bottom-6 px-4 py-2 text-black font-bold bg-white border-4 border-secondary-100 rounded-full focus:outline-none hover:shadow-lg shadow-md transition lg:right-10"
                   >
-                    See Spring Report
+                    Initiatives - Fall 2022
                   </motion.a>
                   <img
                     className="mx-auto w-full rounded-3xl shadow-lg lg:w-9/12"
                     src={SpringReportImage}
-                    alt="Spring Report 2021"
+                    alt="Fall Report 2022"
                   />
                 </div>
               </div>

src/utils/dates.js

@@ -0,0 +1,11 @@
+const getAcademicYear = () => {
+  const currYear = new Date().getFullYear();
+  const currMonth = new Date().getMonth();
+  if (currMonth > 7) {
+    return currYear + "-" + String(parseInt(currYear) + 1);
+  } else {
+    return currYear - 1 + "-" + currYear;
+  }
+};
+
+export { getAcademicYear };