Merge pull request #1 from RaspberryProgramming/master

Merging previous Commits from master to Testing

public/manifest.json

@@ -8,13 +8,13 @@
       "type": "image/x-icon"
     },
     {
-      "src": "logo192.png",
+      "src": "logo-192.webp",
-      "type": "image/png",
+      "type": "image/webp",
       "sizes": "192x192"
     },
     {
-      "src": "logo512.png",
+      "src": "logo-512.webp",
-      "type": "image/png",
+      "type": "image/webp",
       "sizes": "512x512"
     }
   ],

src/components/About.js

@@ -27,13 +27,23 @@ class About extends React.Component {
           JSX is a part of react which makes it easy to design websites directly in javascript code.
         </Card>
 
-        <Card title="Camerin Figueroa" image={"/img/profile.webp"}>
+        <Card title="College Experience" image="https://upload.wikimedia.org/wikipedia/en/thumb/4/4b/Marist_College_Seal_-_Vector.svg/1200px-Marist_College_Seal_-_Vector.svg.png">
-          I am a computer science student at Marist College in Poughkeepsie, NY. I'm closing in on my Bachelors Degree in Computer Science.
+          Throughout my college experience I've been able to improve my understanding of how computers work and how to design different software.
-          I went to Orange County Community College for my Associates Degree in Computer Science. You can find a few of my projects on my
+          I have completed my A.S. degree from Orange County Community College in Computer Science. In the past 2 years I've been working towards my
-          <a href="https://github.com/RaspberryProgramming" target="_blank" rel="noreferrer"> Github</a> or look through a list in the
+          Bachelors degree in computer science at Marist College in Poughkeepsie. Throughout my college experience I've been able to work with others in
-          <Link to="/github"> Github Page</Link>. You can email me at <a href="mailto:cam@camcodes.com">cam@camcodes.com</a>
+          teams and I am currently as of the Fall 2021 Semester been working on a team for a Capstone Project which I can hopefully list on this website
+          at the end of this semester.
         </Card>
 
+        <Card title="Camerin Figueroa" image={"/img/profile.webp"}>
+          You can find a few of my projects on my
+          <a href="https://github.com/RaspberryProgramming" target="_blank" rel="noreferrer"> Github</a> or look through a list of projects on this website
+          at the <Link to="/github"> Github Page</Link>. You can email me at <a href="mailto:cam@camscode.com">cam@camscode.com</a>. You can also find more
+          social media below, just click the image and it'll bring you to the selected website.
+        </Card>
+
+
+
         <div className="social">
 
           <div className="title">

src/components/Home.js

@@ -10,7 +10,7 @@ const Home = (props) => {
       This website helps you access the projects that I've worked on. You can navigate
       at the top to different locations in the site. Within you can find information about me,
       my github repositories, and some youtube videos I've posted. This website is coded with
-      React/Redux and hosted over Vercel. You can email me at <a href="mailto:cam@camcodes.com">cam@camcodes.com</a>.
+      React/Redux and hosted over Vercel. You can email me at <a href="mailto:cam@camscode.com">cam@camscode.com</a>.
     </div>;
 
   return (

src/components/Intro.js

@@ -133,25 +133,20 @@ class Intro extends React.Component {
   // Topics to display in intro
   // DISCLAIMER: Please add content to the topic or bugs may occur...
   topics = [
-      <Topic title="Welcome to My Portfolio" background="/img/background.webp">
+      <Topic link="/about" title="Welcome to My Portfolio" background="/img/background.webp">
         <div>
             This website helps you access the projects that I've worked on. You can navigate
             at the top to different locations in the site. Within you can find information about me,
             my github repositories, and some youtube videos I've posted. This website is coded with
-            React/Redux and hosted over Vercel. You can email me at <a href="mailto:cam@camcodes.com">cam@camcodes.com</a>.
+            React/Redux and hosted over Vercel. You can email me at <a href="mailto:cam@camscode.com">cam@camscode.com</a>.
         </div>
       </Topic>,
-      <Topic title="Studied at Marist College" background="img/marist.webp">
-          Field of Study: Computer Science
-          ...
-          College: <a href="https://www.marist.edu/">Marist.edu</a>
-      </Topic>,
       <Topic link="/github" title="Github" background="img/space.webp">
           View a list of projects I've done right on this website. You can easily direct to github
           where you can see the project code itself.
       </Topic>,
-      <Topic title="Open the Website" background="/img/sunset.webp">
+      <Topic title="Explore the Website" background="/img/sunset.webp">
-          <a href="/" className="btn">Explore Cam's Projects</a>
+          Explore Cam's Projects
       </Topic>
     ];
   

src/components/css/About.css

@@ -31,7 +31,7 @@
     display:flex;
     flex-direction:row;
     align-content:center;
-    justify-content:center;
+    justify-content:flex-start;
     align-items:center;
     flex-wrap: wrap;
     width:85vw;

src/components/css/Card.css

@@ -29,9 +29,11 @@
     border-width: 2px;
     border-color: #A5B2A4;
     border-radius: 5px;
+    padding: 2px;
     height: 10rem;
     width: 10rem;
     margin: auto;
+    background-color: #FAFAFF
 }
 
 @media only screen and (max-width: 600px) {

src/components/subcomponents/ContactModal.js

@@ -17,7 +17,7 @@ const ContactModal = props => {
     const onSubmit = (e) => {
         e.preventDefault(); // Prevent default submit function
 
-        window.open(`mailto:cam@camcodes.com?body=${props.body}`); // Open the message in user's email client
+        window.open(`mailto:cam@camscode.com?body=${props.body}`); // Open the message in user's email client
 
         props.toggleContactModal(); // Close the contact modal
     };

src/components/subcomponents/Topic.js

@@ -11,8 +11,10 @@ const Card = (props) => {
      * background - a url to the background image
      * 
      */
+
     return (
-        <div
+        <a
+            href={props.link}
             className="topic"
             style={{backgroundImage: props.background ? `url(${props.background})`:''}}
             >
@@ -22,7 +24,7 @@ const Card = (props) => {
                     {props.children}
                 </div>
             </div>
-        </div>
+        </a>
     );
 };