Merge branch 'master' of https://github.com/RaspberryProgramming/portfolio

package-lock.json

@@ -5,7 +5,6 @@
   "requires": true,
   "packages": {
     "": {
-      "name": "portfolio",
       "version": "0.1.0",
       "dependencies": {
         "@testing-library/jest-dom": "^5.14.1",
@@ -2292,6 +2291,7 @@
         "jest-resolve": "^26.6.2",
         "jest-util": "^26.6.2",
         "jest-worker": "^26.6.2",
+        "node-notifier": "^8.0.0",
         "slash": "^3.0.0",
         "source-map": "^0.6.0",
         "string-length": "^4.0.1",
@@ -5349,6 +5349,7 @@
       "dependencies": {
         "anymatch": "~3.1.2",
         "braces": "~3.0.2",
+        "fsevents": "~2.3.2",
         "glob-parent": "~5.1.2",
         "is-binary-path": "~2.1.0",
         "is-glob": "~4.0.1",
@@ -7253,7 +7254,8 @@
         "esprima": "^4.0.1",
         "estraverse": "^5.2.0",
         "esutils": "^2.0.2",
-        "optionator": "^0.8.1"
+        "optionator": "^0.8.1",
+        "source-map": "~0.6.1"
       },
       "bin": {
         "escodegen": "bin/escodegen.js",
@@ -11089,6 +11091,7 @@
         "@types/node": "*",
         "anymatch": "^3.0.3",
         "fb-watchman": "^2.0.0",
+        "fsevents": "^2.1.2",
         "graceful-fs": "^4.2.4",
         "jest-regex-util": "^26.0.0",
         "jest-serializer": "^26.6.2",
@@ -12283,6 +12286,7 @@
       "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz",
       "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==",
       "dependencies": {
+        "graceful-fs": "^4.1.6",
         "universalify": "^2.0.0"
       },
       "optionalDependencies": {
@@ -16061,6 +16065,7 @@
         "eslint-webpack-plugin": "^2.5.2",
         "file-loader": "6.1.1",
         "fs-extra": "^9.0.1",
+        "fsevents": "^2.1.3",
         "html-webpack-plugin": "4.5.0",
         "identity-obj-proxy": "3.0.0",
         "jest": "26.6.0",
@@ -19546,8 +19551,10 @@
       "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-1.7.5.tgz",
       "integrity": "sha512-9P3MWk6SrKjHsGkLT2KHXdQ/9SNkyoJbabxnKOoJepsvJjJG8uYTR3yTPxPQvNDI3w4Nz1xnE0TLHK4RIVe/MQ==",
       "dependencies": {
+        "chokidar": "^3.4.1",
         "graceful-fs": "^4.1.2",
-        "neo-async": "^2.5.0"
+        "neo-async": "^2.5.0",
+        "watchpack-chokidar2": "^2.0.1"
       },
       "optionalDependencies": {
         "chokidar": "^3.4.1",
@@ -19637,6 +19644,7 @@
         "anymatch": "^2.0.0",
         "async-each": "^1.0.1",
         "braces": "^2.3.2",
+        "fsevents": "^1.2.7",
         "glob-parent": "^3.1.0",
         "inherits": "^2.0.3",
         "is-binary-path": "^1.0.0",
@@ -20060,6 +20068,7 @@
         "anymatch": "^2.0.0",
         "async-each": "^1.0.1",
         "braces": "^2.3.2",
+        "fsevents": "^1.2.7",
         "glob-parent": "^3.1.0",
         "inherits": "^2.0.3",
         "is-binary-path": "^1.0.0",
@@ -20587,6 +20596,9 @@
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz",
       "integrity": "sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=",
+      "dependencies": {
+        "graceful-fs": "^4.1.6"
+      },
       "optionalDependencies": {
         "graceful-fs": "^4.1.6"
       }
@@ -21067,6 +21079,9 @@
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz",
       "integrity": "sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=",
+      "dependencies": {
+        "graceful-fs": "^4.1.6"
+      },
       "optionalDependencies": {
         "graceful-fs": "^4.1.6"
       }

src/components/About.js

@@ -1,8 +1,6 @@
 import React from 'react';
 import { Link } from 'react-router-dom';
 import './css/About.css';
-import ReactImage from '../img/react.webp';
-import ProfilePic from '../img/profile.webp';
 import Theater from './Theater';
 import Card from './Card';
 
@@ -15,14 +13,14 @@ class About extends React.Component {
   render() {
     return (
       <div className="About">
-        <Theater title="About" description="This page has information about me and about this site." extraClasses="h-50v" />
-        <Card title="Build with React" image={ReactImage}>
+        <Theater title="About" description="This page has information about me and about this site." extraClasses="h-50v" background="/img/sunset.webp"/>
+        <Card title="Build with React" image="/img/react.webp">
           This website is created with <a href="https://reactjs.org/">React</a>, a javascript library for creating user interfaces and webapps.
           React uses a component based design to help developers create easily re-usable code, and to help streamline the development process.
           JSX is a part of react which makes it easy to design websites directly in javascript code.
         </Card>
 
-        <Card title="Camerin Figueroa" image={ProfilePic}>
+        <Card title="Camerin Figueroa" image={"/img/profile.webp"}>
           I am a computer science student at Marist College in Poughkeepsie, NY. I'm closing in on my Bachelors Degree in Computer Science.
           I went to Orange County Community College for my Associates Degree in Computer Science. 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 in the

src/components/Github.js

@@ -3,8 +3,11 @@ import { connect } from 'react-redux';
 import './css/Github.css';
 import {getRepos, getRepoLanguages} from '../actions';
 import Theater from './Theater';
-import space from '../img/space.webp';
+<<<<<<< HEAD
 import _ from 'lodash';
+=======
+
+>>>>>>> 2454172a37ea260dff0829b5bead236b53ce5a2d
 class Github extends React.Component {
 
   componentDidMount() {
@@ -95,7 +98,7 @@ class Github extends React.Component {
             You can check them out, fork them, and maybe give them a 
             star. Any projects that have a website will have a button 
             that will bring you right to the site"
-          background={space}
+          background="/img/space.webp"
           extraClasses="peak"
         />
 

src/components/Navigation.js

@@ -18,10 +18,6 @@ const Navigation = (props) => {
         Github Repos
         <Github />
       </Link>
-      <Link to="/youtube">
-        Youtube Videos
-        <Youtube />
-      </Link>
       <Link to="/about">
         About
         <FileEarmarkPerson />