Add About Page pict

pioneers · Aug 26, 2023 · cd4e0a2 · cd4e0a2
1 parent 3316a9f
commit cd4e0a2
Show file tree

Hide file tree

Showing 15 changed files with 64 additions and 37 deletions.
diff --git a/pie-website/src/assets/data/data.js b/pie-website/src/assets/data/data.js
@@ -9,7 +9,7 @@ import { GiPieSlice } from "@react-icons/all-files/gi/GiPieSlice"
 import { RiTeamFill } from "@react-icons/all-files/ri/RiTeamFill"
 import { ImCalendar } from "@react-icons/all-files/im/ImCalendar"
 import { AiOutlineRead } from "@react-icons/all-files/ai/AiOutlineRead"
-// import { FaDiscord } from "@react-icons/all-files/fa/FaDiscord"
+import { FaDiscord } from "@react-icons/all-files/fa/FaDiscord"
 import { BiCommentDots } from "@react-icons/all-files/bi/BiCommentDots"
 import { AiOutlineMail } from "@react-icons/all-files/ai/AiOutlineMail"
 import { AiOutlineProject } from "@react-icons/all-files/ai/AiOutlineProject"
@@ -107,11 +107,11 @@ const sublinks = [
         subpage: "Communication",
         url: "",
         subsections: [
-          // {
-          //   label: "Discord",
-          //   icon: <FaDiscord />,
-          //   url: "https://styled-components.com/",
-          // },
+          {
+          label: "Discord",
+          icon: <FaDiscord />,
+          url: "https://styled-components.com/",
+          },
           // {
           //   label: "Piazza",
           //   icon: <BiCommentDots />,

diff --git a/pie-website/src/assets/images/stock-images/sp23_final_comp.jpg b/pie-website/src/assets/images/stock-images/sp23_final_comp.jpg
diff --git a/pie-website/src/assets/themes/globalStyles.js b/pie-website/src/assets/themes/globalStyles.js
@@ -66,7 +66,7 @@ font-family: 'Source Sans Pro', sans-serif; */
     font-family: ${theme.fonts.headingFont};
     font-weight: 600;
     line-height: 1.25;
-    text-transform: capitalize;
+    // text-transform: capitalize;
     letter-spacing: ${theme.letterSpacing};
   }
 
@@ -158,7 +158,7 @@ h5 {
     display: block;
     font-size: ${theme.fonts.smallText};
     margin-bottom: 0.5rem;
-    text-transform: capitalize;
+    // text-transform: capitalize;
     letter-spacing: ${theme.letterSpacing};
   }
   .form-input,
@@ -184,7 +184,7 @@ h5 {
   .form-alert {
     color: ${theme.colors.redDark};
     letter-spacing: ${theme.let};
-    text-transform: capitalize;
+    // text-transform: capitalize;
   }
 
   .loading {

diff --git a/pie-website/src/components/AlternativeButton.js b/pie-website/src/components/AlternativeButton.js
@@ -41,7 +41,7 @@ const CustomButton = styled.button.attrs(props => ({
   padding: 0.375rem 1rem;
   box-shadow: ${theme.shadows.shadow1};
   transition: ${theme.transition};
-  text-transform: capitalize;
+  // text-transform: capitalize;
   display: inline-block;
   margin: 0.25rem 0.25rem;
 

diff --git a/pie-website/src/components/ContactUs.js b/pie-website/src/components/ContactUs.js
@@ -123,7 +123,7 @@ const CustomButton = styled.button.attrs(props => ({
   padding: 0.375rem 0.75rem;
   box-shadow: ${theme.shadows.shadow1};
   transition: ${theme.transition};
-  text-transform: capitalize;
+  // text-transform: capitalize;
   display: inline-block;
   margin: 1rem 0.25rem 0rem 0.25rem;
   color: ${theme.colors.white};

diff --git a/pie-website/src/components/DropdownContents/CompetitionDropdown.js b/pie-website/src/components/DropdownContents/CompetitionDropdown.js
@@ -39,22 +39,19 @@ const CompetitionDropdown = () => {
               </LinkList>
             </div>
             <div>
-              {/*<h4>Communication</h4>
+              <h4>Communication</h4>
               <LinkList>
-                {
-                  <li>
-                    <Link to="https://discord.gg/9gDpKcjf">Discord</Link>
-                  </li>
-                }
-                {<li>
-                  <Link to="https://piazza.com/class/kjxv8nixe2v69p">
-                    Piazza
-                  </Link>
-                </li>}
-                <li>
-                  <Link to="/#mailinglist">Mailing List</Link>
-                </li>
-              </LinkList>*/}
+              <li>
+                <Link to="https://discord.gg/5nc3tPJK">Discord</Link>
+              </li>
+
+              {/* <li>
+                <Link to="https://piazza.com/class/kjxv8nixe2v69p">Piazza</Link>
+              </li> */}
+              <li>
+                <Link to="/#mailinglist">Mailing List</Link>
+              </li>
+              </LinkList>
             </div>
           </Flex>
         </div>

diff --git a/pie-website/src/components/DropdownContents/Components.js b/pie-website/src/components/DropdownContents/Components.js
@@ -3,8 +3,8 @@ import styled, { css } from "styled-components"
 import theme from "../../assets/themes/theme"
 
 export const Heading = styled.h3`
-  text-transform: uppercase;
-  font-weight: bold;
+  // text-transform: uppercase;
+  // font-weight: bold;
   font-size: 1.1rem;
   margin-top: 0;
   margin-bottom: ${props => (props.noMarginBottom ? 0 : "1rem")};

diff --git a/pie-website/src/components/Sidebar.js b/pie-website/src/components/Sidebar.js
@@ -264,7 +264,7 @@ const SidebarWrapper = styled.div`
   .sidebar-sublinks a {
     display: block;
     color: ${theme.colors.grey900};
-    text-transform: capitalize;
+    // text-transform: capitalize;
     display: flex;
     align-items: center;
   }

diff --git a/pie-website/src/components/StripeNavbar.js b/pie-website/src/components/StripeNavbar.js
@@ -107,7 +107,7 @@ const CustomNav = styled.nav`
     border-color: transparent;
     font-size: 1.1rem;
     color: ${theme.colors.grey900};
-    text-transform: capitalize;
+    // text-transform: capitalize;
     letter-spacing: 1px;
     width: 15rem;
     cursor: default;

diff --git a/pie-website/src/components/Submenu.js b/pie-website/src/components/Submenu.js
@@ -134,7 +134,7 @@ const SubmenuWrapper = styled.aside`
   .submenu-center a {
     width: 11rem;
     display: block;
-    text-transform: capitalize;
+    // text-transform: capitalize;
     display: flex;
     align-items: center;
     margin: 0.5rem 0rem;

diff --git a/pie-website/src/pages/About.js b/pie-website/src/pages/About.js
@@ -25,7 +25,7 @@ import Row from "react-bootstrap/esm/Row"
 import theme from "../assets/themes/theme"
 import CustomizedContainer from "../components/CustomizedContainer"
 
-import pic from "../assets/images/stock-images/retreat-sp18-team.jpg"
+import pic from "../assets/images/stock-images/sp23_final_comp.jpg"
 
 import { AnchorLink as Link } from "gatsby-plugin-anchor-links"
 

diff --git a/pie-website/src/pages/GetInvolved.js b/pie-website/src/pages/GetInvolved.js
@@ -179,11 +179,11 @@ const GetInvolved = () => {
               <p>
                 Please contact us at{" "}
                 <a
-                  href="mailto:partnerships@pioneers.berkeley.edu"
+                  href="mailto:leadership@pioneers.berkeley.edu"
                   target="_blank"
                   rel="noreferrer"
                 >
-                  partnerships@pioneers.berkeley.edu
+                  leadership@pioneers.berkeley.edu
                 </a>
               </p>
             </Col>

diff --git a/pie-website/src/pages/SupportUs.js b/pie-website/src/pages/SupportUs.js
@@ -80,7 +80,7 @@ const SupportUs = () => {
             textColor={theme.colors.grey700}
           >
             <Row className="inner-container">
-              <Col sm={12} md={12} lg={6}>
+              {/* <Col sm={12} md={12} lg={6}>
                 <div className="card">
                   <div>
                     <div id="how-to-help" />
@@ -96,7 +96,7 @@ const SupportUs = () => {
                     </AlternativeButton>
                   </div>
                 </div>
-              </Col>
+              </Col> */}
               <Col sm={12} md={12} lg={6}>
                 <div className="card">
                   <div>

diff --git a/pie-website/src/pages/getInvolved/Schools.js b/pie-website/src/pages/getInvolved/Schools.js
@@ -5,6 +5,11 @@ import Layout from "../../components/Layout"
 import HelmetWrapper from "../../components/HelmetWrapper"
 import theme from "../../assets/themes/theme"
 import styled from "styled-components"
+import Container from "react-bootstrap/esm/Container"
+import Header from "../../components/Header"
+import AlternativeButton from "../../components/AlternativeButton"
+
+
 const Schools = () => {
   return (
     <Layout>
@@ -18,7 +23,26 @@ const Schools = () => {
         </div>
       </HeroWrapper>
       <CustomizedContainer>
-        <h1>Under Construction</h1>
+        <Container fluid>
+          <Header type="blue">Learn Robotics an at Affordable Price!</Header>
+          <p>
+            Pioneers in Engineering is committed to making robotics more accessible
+            to underresourced schools. We provide all of the necessary materials,
+            resources, and support required for schools to start a robotics team and
+            participate in our biannual robotics competition at the low cost of just
+            $100 per team.
+            <br /><br />
+            If you are from a school without robotics education and are interested in 
+            starting a team, please email us at{" "}
+            <a
+              href="mailto:leadership@pioneers.berkeley.edu"
+              target="_blank"
+              rel="noreferrer"
+            >
+              foundation@pioneers.berkeley.edu
+            </a>{" "} for more info and to get contacted when our application opens.
+          </p>
+        </Container>
       </CustomizedContainer>
     </Layout>
   )

diff --git a/pie-website/src/pages/index.js b/pie-website/src/pages/index.js
@@ -206,6 +206,12 @@ const HeroWrapper = styled.div`
     padding: 1rem;
     h1 {
       font-size: 5rem;
+      container-name: "hero-title";
+    }
+    @media (max-width: 500px) {
+      h1 {
+        font-size: 3em;
+      }
     }
   }
 `