Merge branch 'main' into 89-update-join-info

components/companyCard.jsx

@@ -0,0 +1,25 @@
+import Image from "next/image";
+import Link from "next/link";
+export default function CompanyCard({ json, basePath }) {
+  const style = "relative " + "h-28 w-28"; // larger: "h-48 w-48"
+  return (
+    <Link
+      className="text-center rounded-lg bg-grey py-4 px-8 w-full sm:w-60 hover:-translate-y-1"
+      href={json.link}
+    >
+      <Image
+        className={
+          "object-contain mx-auto " + "h-28 w-28" // larger: "glow h-48 w-48"
+        }
+        width="500"
+        height="500"
+        src={
+          basePath
+            ? `${basePath}/images/worked-with/${json.image}`
+            : `/images/worked-with/${json.image}`
+        }
+        alt={json.name}
+      />
+    </Link>
+  );
+}

components/companySection.jsx

@@ -0,0 +1,19 @@
+import CompanyCard from "./companyCard";
+
+export default function CompanySection({ group, basePath }) {
+  return (
+    <div className="py-8 px-4 mx-auto max-w-screen-lg text-center lg:px-6">
+      <div
+        className={`flex flex-wrap justify-center gap-4 lg:gap-16 sm:grid-cols-2 md:grid-cols-3 lg:grid-cols-4`}
+      >
+        {group.companies.map((company, index) => (
+          <CompanyCard
+            key={index}
+            basePath={basePath}
+            json={company}
+          />
+        ))}
+      </div>
+    </div>
+  );
+}

components/currentProjectCard.jsx

@@ -42,7 +42,7 @@ const styles = {
     display: 'flex',
     flexDirection: 'row',
     backgroundColor: '#333',
-    padding: '32px',
+    padding: '25px', 
     borderRadius: '8px',
     width: '100%',
     maxWidth: '600px',
@@ -57,12 +57,9 @@ const styles = {
     justifyContent: 'center',
   },
   projectInfo: {
-    flex: '0 0 65%',
-    display: 'flex',
-    flexDirection: 'column',
+    flex: '1 1 300px',
     alignItems: 'center',
     justifyContent: 'center',
-    paddingLeft: '32px',
   },
   projectImage: {
     borderRadius: '10%',
@@ -83,6 +80,7 @@ const styles = {
     flexDirection: 'column',
     alignItems: 'center',
     justifyContent: 'center',
+    flex: '1 1 75px',
   },
   leadText: {
     fontSize: '20px',

config/companies.json

@@ -0,0 +1,51 @@
+[
+  {
+    "companies": [
+      {
+        "name": "Rocket Companies",
+        "link": "https://www.myrocketcareer.com/",
+        "image": "rocket-company.png"
+      },
+      {
+        "name": "PwC",
+        "link": "https://www.pwc.com/",
+        "image": "pwc.png"
+      },
+      {
+        "name": "Bloomberg",
+        "link": "https://www.bloomberg.com/",
+        "image": "bloomberg.png"
+      },
+      {
+        "name": "Dominos",
+        "link": "https://www.dominos.com/",
+        "image": "dominos.png"
+      },
+      {
+        "name": "Figma",
+        "link": "https://www.figma.com/",
+        "image": "figma.png"
+      },
+      {
+        "name": "Discover",
+        "link": "https://www.discover.com/",
+        "image": "discover.png"
+      },
+      {
+        "name": "Capital One",
+        "link": "https://www.capitalone.com/",
+        "image": "capital-one.png"
+      },
+      {
+        "name": "Nissan",
+        "link": "https://www.nissan-global.com/",
+        "image": "nissan.png"
+      },
+      {
+        "name": "Rockstar Games",
+        "link": "https://www.rockstargames.com/",
+        "image": "rockstar-games.png"
+      }
+    ]
+  }
+]

config/join.md

@@ -31,20 +31,15 @@ New members are required to **complete two tutorials** giving an introduction to
     The tutorials for Fall 2024 are now published in the tutorial GitHub [repository](https://github.com/MichiganDataScienceTeam/MDST-Onboarding). The repository contains all the materials and instructions you need to complete the tutorials, as well as information about the support we provide if you have any questions.
 </div>
 
-<span className="highlight">Note: </span> Please direct all technical and logistical questions regarding tutorials to our <a href="https://edstem.org/us/join/6PXxzF">forum</a> for better visibility.
+<span className="highlight">Note: </span> Please direct all technical and logistical questions regarding tutorials to our <a href="https://edstem.org/us/join/jxVrDG">forum</a> for better visibility.
 
 <hr>
 
 ### Step 4: Submit Tutorials
 <!--- Do we have a new project submission link for FA 2024? --->
 As a final step to join the club, you must submit your tutorials certifying that you've completed the fundamental requirements to join the club. 
 
-<div className="callout font-normal">
-    Submit your tutorials <a href="https://forms.gle/5P3dFz1UGBpCyL538">here</a> to finish your process of joining the club. Fill out this form by <b>September 16th, 2024</b> at <b>11:59 PM</b> Eastern Standard Time.
-</div>
-
-See our [Tutorials Repo](https://github.com/MichiganDataScienceTeam/MDST-Onboarding) for information on completing the tutorials. If you've never worked with Git and GitHub before, check out our [Git Version Control Guide](https://docs.google.com/document/d/1pq42R2xr_yoyhyzWE0ugReHgEKgwLdjrJR4mT3_CQEo/edit?usp=sharing).
-
+See our [Tutorials Repo](https://github.com/MichiganDataScienceTeam/MDST-Onboarding) for information on completing and submiting the tutorials. 
 - <span className="highlight">If your checkpoints are incomplete, then you will not be allowed to join MDST for that semester.</span> In such circumstance, you may attempt the checkpoints again the next semester and resubmit.
 
 
@@ -56,8 +51,8 @@ The tutorial submission form will be due **September 16th, 11:59 PM**, after whi
 <!--- Need to add time and place --->
 After joining the club, we will host a project exploration fair on **September 8th, 2024** to share the projects which we will run this semester. You can speak with our project leads and learn first-hand about the type of work being done in each project, what the prerequistes are, and if the project is a good fit for you.
 
-After attending, you will be given access to a form to specify your top 3 project choices, from which we will place you into your preferred project (subject to constraints and appropriate difficulty). 
+After attending, you will be given access to a form to specify your top 3 project choices, from which we will place you into your preferred project (subject to constraints and appropriate difficulty).
 
 <div className="callout font-normal">
     ⚠️ You **must attend** the exploration fair to be placed on a project this semester. If you are unable to attend but would still like to participate in projects, you must [email us](mailto:[email protected]) in advance letting us know, and we will consider your request on a case-by-case basis. If emailing us, please include `[EXPLORATION FAIR]` in your email title.
-</div>
+</div>

config/ourteam.json

@@ -161,7 +161,7 @@
       {
         "name": "Aaron Williams",
         "title": "Project Planner",
-        "image": "temp.jpeg"
+        "image": "aaron.jpg"
       },
       {
         "name": "Anthony Chen",

config/sponsors.json

@@ -7,6 +7,11 @@
         "link": "https://www.myrocketcareer.com/",
         "image": "rocket.png"
       },
+      {
+        "name": "Discover",
+        "link": "https://www.discover.com/",
+        "image": "discover.png"
+      },
       {
         "name": "Wolverine Trading",
         "link": "https://www.wolve.com/",

pages/index.jsx

@@ -4,6 +4,7 @@ import Hero from "@/components/hero";
 import Icon from "@/components/icon";
 import Layout from "@/components/layout";
 import SponsorSection from "@/components/sponsorSection";
+import CompanySection from "@/components/companySection";
 import Timeline from "@/components/timeline";
 import Wave from "@/components/wave";
 import Wave180 from "@/components/wave180";
@@ -14,7 +15,7 @@ import Link from "next/link";
 import { useRouter } from "next/router";
 import { useState } from "react";
 
-export default function Home({ sponsors, projects, timeline, communityImages }) {
+export default function Home({ companies, sponsors, projects, timeline, communityImages }) {
   sponsors[0].tier = "MDST is made possible by our sponsors";
   const router = useRouter();
   const basePath = router.basePath;
@@ -127,6 +128,12 @@ export default function Home({ sponsors, projects, timeline, communityImages })
         </h2>
         <SponsorSection basePath={basePath} group={sponsors[0]} />
       </div>
+      <div className="container mx-auto px-2 mt-8">
+        <h2 className="text-3xl text-center">
+          Companies We Worked With:
+        </h2>
+        <CompanySection basePath={basePath} group={companies[0]}/>
+      </div>
     </Layout>
   );
 }
@@ -218,9 +225,10 @@ function Carousel({ projects, basePath }) {
 
 export async function getStaticProps() {
   const sponsors = loadStaticData("sponsors.json");
+  const companies = loadStaticData("companies.json");
   const projects = loadStaticData("homepage.json");
   const timeline = loadStaticData("timeline.json");
   const communityImages = loadStaticData("communityImages.json");
 
-  return { props: { sponsors, projects, timeline, communityImages } };
+  return { props: { companies, sponsors, projects, timeline, communityImages } };
 }